Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10
authorroger <cz@rock-chips.com>
Thu, 14 Aug 2014 06:52:36 +0000 (14:52 +0800)
committerroger <cz@rock-chips.com>
Thu, 14 Aug 2014 06:52:36 +0000 (14:52 +0800)
commita826090f0c1e407d1c2a8bba661412b334bd6e09
tree163581e7bea6d9b27592c73f25770b3ce6f173d2
parent538df30955c049ab5df1de13dfd919211ad0e98c
parent1897916287efb744b887a7ccaf3af39beebc2531
Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10
arch/arm/boot/dts/rk3128-box.dts
arch/arm/boot/dts/rk312x.dtsi