Merge branch 'develop-3.10-next' of ssh://10.10.10.29/rk/kernel into develop-3.10...
authorwdc <wdc@rock-chips.com>
Tue, 8 Jul 2014 01:17:57 +0000 (09:17 +0800)
committerwdc <wdc@rock-chips.com>
Tue, 8 Jul 2014 01:17:57 +0000 (09:17 +0800)
1  2 
arch/arm/boot/dts/rk3036.dtsi

Simple merge