Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10
authorhuang zhibao <hzb@rock-chips.com>
Fri, 13 Mar 2015 06:58:46 +0000 (14:58 +0800)
committerhuang zhibao <hzb@rock-chips.com>
Fri, 13 Mar 2015 06:58:46 +0000 (14:58 +0800)
1  2 
arch/arm/boot/dts/rk312x-sdk.dtsi

Simple merge