Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10
authorxjh <xujh@rock-chips.com>
Wed, 7 May 2014 13:43:43 +0000 (21:43 +0800)
committerxjh <xujh@rock-chips.com>
Wed, 7 May 2014 13:43:43 +0000 (21:43 +0800)
commit0c376ebabadc7570de3fb9c0eecdba3369f0184e
tree56130703c14323826e8819f4a74b5e7c15d0bc55
parentc167037b8ae5bc428f19a4c8eb0366dcd0284a56
parent0180727dca7e77c4ec3a06995aea3780ff1dd3a2
Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10
arch/arm/boot/dts/rk3288-p977.dts
arch/arm/boot/dts/rk3288-tb.dts