From: wdc <wdc@rock-chips.com>
Date: Thu, 11 Sep 2014 11:12:27 +0000 (+0800)
Subject: Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10
X-Git-Tag: firefly_0821_release~4724
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=157773d85660deae25d3ca848bece504bce60dbb;p=firefly-linux-kernel-4.4.55.git

Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10
---

157773d85660deae25d3ca848bece504bce60dbb