Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop

This commit is contained in:
ubuntu
2011-03-23 18:59:30 -07:00

View File

@@ -40,6 +40,15 @@ arch/arm/configs/rk29_Winaccord_defconfig
arch/arm/mach-rk29/board-rk29-aigo.c
arch/arm/mach-rk29/board-rk29aigo-key.c
arch/arm/configs/rk29_aigo_defconfig
arch/arm/mach-rk29/board-rk29-a22*
arch/arm/configs/rk29_a22_defconfig
arch/arm/mach-rk29/board-rk29-fih.c
arch/arm/configs/rk29_FIH_defconfig
arch/arm/mach-rk29/board-rk29-phonesdk*
arch/arm/configs/rk29_phonesdk_defconfig
)
# ---------------------------------------------------------------------------