Merge commit 'v3.4-rc5' into devel
authorSergio Aguirre <saaguirre@ti.com>
Wed, 2 May 2012 14:36:14 +0000 (09:36 -0500)
committerSergio Aguirre <saaguirre@ti.com>
Wed, 2 May 2012 14:36:14 +0000 (09:36 -0500)
commitf4a4a84409a0c9e0c3cd2000b2b9268caf0b175d
tree32a462a8b31bad0911019e3e5dc6eaa80019ff76
parentf76864bb8e47d8e94a63ba85cae13298fa3822cd
parent69964ea4c7b68c9399f7977aa5b9aa6539a6a98a
Merge commit 'v3.4-rc5' into devel

Conflicts:
arch/arm/mach-omap2/devices.c
drivers/media/video/Kconfig

Signed-off-by: Sergio Aguirre <saaguirre@ti.com>
arch/arm/mach-omap2/Kconfig
arch/arm/mach-omap2/Makefile
arch/arm/mach-omap2/board-4430sdp.c
arch/arm/mach-omap2/devices.c
arch/arm/mach-omap2/omap_hwmod_44xx_data.c
drivers/media/video/Kconfig
drivers/media/video/Makefile
include/linux/mfd/twl6040.h
include/media/v4l2-chip-ident.h