From: li bing <libing@rock-chips.com>
Date: Wed, 20 Aug 2014 00:58:40 +0000 (+0800)
Subject: Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into my
X-Git-Tag: firefly_0821_release~4856
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ea128f7084409a25789f0dd0b0040ce38c2ea274;p=firefly-linux-kernel-4.4.55.git

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

Conflicts:
	arch/arm/boot/dts/rk312x-sdk.dtsi
---

ea128f7084409a25789f0dd0b0040ce38c2ea274