Merge remote-tracking branch 'kernel-2.6.32/develop' into develop-2.6.36
author黄涛 <huangtao@rock-chips.com>
Tue, 9 Aug 2011 02:06:42 +0000 (10:06 +0800)
committer黄涛 <huangtao@rock-chips.com>
Tue, 9 Aug 2011 02:06:42 +0000 (10:06 +0800)
commit2f206fddfe16efd5722cfce24f8335bea3ff6692
treeeee4056fee8bcbae536148351f146e12176dfb8c
parent8f6c9c4ba0024843dfda63b841206caadf7f836c
parentd8a4cd863b29f7481d6c71deed7334838107e264
Merge remote-tracking branch 'kernel-2.6.32/develop' into develop-2.6.36

Conflicts:
drivers/input/touchscreen/Makefile
drivers/media/video/rk29_camera.c
sound/soc/codecs/wm8994.c
arch/arm/mach-rk29/board-rk29-phonesdk.c
arch/arm/mach-rk29/board-rk29phonepadsdk.c
arch/arm/mach-rk29/devices.c
drivers/input/touchscreen/Kconfig
drivers/input/touchscreen/Makefile
drivers/media/video/ov5640.c
drivers/media/video/rk29_camera.c
drivers/mmc/host/rk29_sdmmc.c
drivers/power/wm831x_power.c
drivers/video/hdmi/hdmi-core.c