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

diff --cc arch/arm/mach-rk29/board-rk29-phonesdk.c
Simple merge

diff --cc arch/arm/mach-rk29/board-rk29phonepadsdk.c
index 32b8479981275e593a53963f7b64e739c265d651,e1c21f3c836b45cf61bbd0ad279c30c42cc1b074..2dcf75d5c4eb059fe99b14ced1b1ca9f6c3aa229
mode 100644,100755..100755
--- 1/arch/arm/mach-rk29/board-rk29phonepadsdk.c
--- 2/arch/arm/mach-rk29/board-rk29phonepadsdk.c
+++ b/arch/arm/mach-rk29/board-rk29phonepadsdk.c

diff --cc arch/arm/mach-rk29/devices.c
Simple merge

diff --cc drivers/input/touchscreen/Kconfig
Simple merge

diff --cc drivers/input/touchscreen/Makefile
index ac2ae262e84962fe695848054d74760ad171b3dc,4c05a40954ae1c4954d03c78626cba4d744e0291..219d37e202821c49001563249dacae9368b33e37
mode 100755,100644..100644
--- 1/drivers/input/touchscreen/Makefile
--- 2/drivers/input/touchscreen/Makefile
+++ b/drivers/input/touchscreen/Makefile
@@@ -54,6 -42,6 +54,7 @@@ obj-$(CONFIG_TOUCHSCREEN_WM97XX_ATMEL)        
  obj-$(CONFIG_TOUCHSCREEN_WM97XX_MAINSTONE)    += mainstone-wm97xx.o
  obj-$(CONFIG_TOUCHSCREEN_WM97XX_ZYLONITE)     += zylonite-wm97xx.o
  obj-$(CONFIG_TOUCHSCREEN_W90X900)     += w90p910_ts.o
++obj-$(CONFIG_TOUCHSCREEN_TPS6507X)    += tps6507x-ts.o
  obj-$(CONFIG_TOUCHSCREEN_PCAP)                += pcap_ts.o
  obj-$(CONFIG_TOUCHSCREEN_XPT2046_NORMAL_SPI)  += xpt2046_ts.o
  obj-$(CONFIG_TOUCHSCREEN_XPT2046_TSLIB_SPI)   += xpt2046_tslib_ts.o ts_lib/

diff --cc drivers/media/video/ov5640.c
Simple merge

diff --cc drivers/media/video/rk29_camera.c
index ac95527486c5e53095cd29f2b5e2979a8c7fef0b,3e19731fe08ce3e81200bd6f56d0989c40d035cf..f4bcf2023b935678f5f4de90cce3d3e2fbd3c6d7
--- 1/drivers/media/video/rk29_camera.c
--- 2/drivers/media/video/rk29_camera.c
+++ b/drivers/media/video/rk29_camera.c
@@@ -555,4 -555,4 +555,4 @@@ static struct platform_device android_p
  \r
  #endif\r
  \r
--#endif //#ifdef CONFIG_VIDEO_RK29
++#endif //#ifdef CONFIG_VIDEO_RK29

diff --cc drivers/mmc/host/rk29_sdmmc.c
index 72cf1c428f9a46c7eaf1e78dce43476865d4cf94,a4635fd95afaf2b11ac6ca7da80d2f1a4a10e203..0e8de6d7c1bdde23a7c794628d3c0f078f1d9d75
mode 100644,100755..100755
--- 1/drivers/mmc/host/rk29_sdmmc.c
--- 2/drivers/mmc/host/rk29_sdmmc.c
+++ b/drivers/mmc/host/rk29_sdmmc.c
@@@ -2757,9 -2793,9 +2795,10 @@@ static int rk29_sdmmc_probe(struct plat
        }
  
      mmc->ops = &rk29_sdmmc_ops[pdev->id];
 +      mmc->pm_flags |= MMC_PM_IGNORE_PM_NOTIFY;
        mmc->f_min = FOD_FREQ;
- #if 0
+       
+ #if RK29_SDMMC_DEFAULT_SDIO_FREQ
      mmc->f_max = SDHC_FPP_FREQ;
  #else
      if(RK29_CTRL_SDMMC_ID== host->pdev->id)

diff --cc drivers/power/wm831x_power.c
Simple merge

diff --cc drivers/video/hdmi/hdmi-core.c
Simple merge