Merge branch 'develop-3.10-next' of ssh://10.10.10.29/rk/kernel into develop-3.10...
authorZheng Yang <zhengyang@rock-chips.com>
Sat, 12 Jul 2014 03:30:09 +0000 (11:30 +0800)
committerZheng Yang <zhengyang@rock-chips.com>
Sat, 12 Jul 2014 03:30:09 +0000 (11:30 +0800)
1  2 
arch/arm/boot/dts/rk3036-sdk.dts
arch/arm/boot/dts/rk3036.dtsi

Simple merge
Simple merge