Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10
authorchenyifu <chenyf@rock-chips.com>
Fri, 26 Sep 2014 07:16:05 +0000 (15:16 +0800)
committerchenyifu <chenyf@rock-chips.com>
Fri, 26 Sep 2014 07:16:05 +0000 (15:16 +0800)
1  2 
arch/arm/boot/dts/rk312x.dtsi

Simple merge