Merge remote-tracking branch 'kernel-2.6.32/develop' into develop-2.6.36
author黄涛 <huangtao@rock-chips.com>
Tue, 23 Aug 2011 06:51:45 +0000 (14:51 +0800)
committer黄涛 <huangtao@rock-chips.com>
Tue, 23 Aug 2011 06:51:45 +0000 (14:51 +0800)
commit237861ff518a4309f892b1597388c62f8f8f4d00
tree002762d302ca50148a70c40909d5427014b4c17e
parent788b01946cc6c99ad15881cf559e63bcbd722e53
parentac2e1316edcbb0a54d86ee6c26f0f07baa09292c
Merge remote-tracking branch 'kernel-2.6.32/develop' into develop-2.6.36

Conflicts:
.gitignore
arch/arm/include/asm/mach/map.h
arch/arm/mach-rk29/vpu_service.c
drivers/base/power/main.c
drivers/gpio/Makefile
drivers/input/touchscreen/Kconfig
drivers/media/video/Kconfig
drivers/media/video/gc0309.c
drivers/media/video/gc2015.c
drivers/mfd/Kconfig
drivers/mfd/Makefile
drivers/regulator/Kconfig
drivers/regulator/Makefile
drivers/usb/gadget/f_mass_storage.c
drivers/video/Kconfig
34 files changed:
.gitignore
Makefile
arch/arm/include/asm/mach/map.h
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
arch/arm/mm/mmu.c
drivers/base/power/main.c
drivers/gpio/Kconfig
drivers/input/gsensor/mma8452.c
drivers/input/touchscreen/Kconfig
drivers/input/touchscreen/Makefile
drivers/media/video/Kconfig
drivers/media/video/Makefile
drivers/media/video/gc0309.c
drivers/media/video/gc2015.c
drivers/media/video/ov2659.c
drivers/media/video/ov3640.c
drivers/media/video/rk29_camera.c
drivers/mmc/host/rk29_sdmmc.c
drivers/net/rk29_vmac.c
drivers/net/usb/usbnet.c
drivers/power/Kconfig
drivers/power/wm831x_power.c
drivers/regulator/Kconfig
drivers/regulator/Makefile
drivers/usb/gadget/f_mass_storage.c
drivers/video/Kconfig
drivers/video/backlight/rk29_backlight.c
drivers/video/rk29_fb.c
include/media/v4l2-chip-ident.h
sound/soc/rk29/rk29_i2s.c