Merge branch 'develop' of 192.168.1.29:/home/rockchip/kernel into develop
authorcmc <cmc@rock-chips.com>
Mon, 29 Nov 2010 07:21:29 +0000 (15:21 +0800)
committercmc <cmc@rock-chips.com>
Mon, 29 Nov 2010 07:21:29 +0000 (15:21 +0800)
commit7cd165487e9f8416898fab3d7a38a1ae1c3338b0
tree72ea458d7a4bc74d430004dd2172b71bdd5a6a18
parent5ee66003f164888aa984b31ecc6238ae3f2970b9
parentf6f5c4723639eb506b588ddc903f28f33643caf6
Merge branch 'develop' of 192.168.1.29:/home/rockchip/kernel into develop
arch/arm/mach-rk29/board-rk29sdk.c