Merge remote-tracking branch 'kernel-2.6.32/develop' into develop-2.6.36
author黄涛 <huangtao@rock-chips.com>
Thu, 27 Oct 2011 10:40:06 +0000 (18:40 +0800)
committer黄涛 <huangtao@rock-chips.com>
Thu, 27 Oct 2011 10:40:06 +0000 (18:40 +0800)
commitfdfc405c78c5d7984efb7d2a5c4837d86a55abea
treebdd8ef6c6d8328551c12318b0f1812509b9b2847
parentd120da9fa2da5fe16dbab925a1dcf87a280c92d8
parentb6e4c3647a49efda5a16a94594534765f39deb82
Merge remote-tracking branch 'kernel-2.6.32/develop' into develop-2.6.36

Conflicts:
drivers/media/video/rk29_camera_oneframe.c
drivers/mmc/core/core.c
drivers/usb/gadget/f_mass_storage.c
include/linux/mmc/host.h
24 files changed:
arch/arm/mach-rk29/board-rk29-ddr3sdk.c
arch/arm/mach-rk29/board-rk29-phonesdk.c
arch/arm/mach-rk29/board-rk29phonepadsdk.c
arch/arm/mach-rk29/board-rk29sdk.c
arch/arm/mach-rk29/vpu_service.c
drivers/i2c/busses/i2c-rk29.c
drivers/media/video/rk29_camera.c
drivers/media/video/rk29_camera_oneframe.c
drivers/media/video/soc_camera.c
drivers/mmc/core/core.c
drivers/mmc/core/sdio.c
drivers/mmc/host/Kconfig
drivers/mmc/host/rk29_sdmmc.c
drivers/mmc/host/rk29_sdmmc_old.c
drivers/usb/dwc_otg/dwc_otg_hcd.c
drivers/usb/gadget/f_mass_storage.c
drivers/usb/gadget/storage_common.c
drivers/video/Kconfig
drivers/video/rk29_fb.c
include/linux/mmc/host.h
include/media/soc_camera.h
sound/soc/codecs/wm8900.c
sound/soc/rk29/rk29_i2s.c
sound/soc/rk29/rk29_pcm.c