Merge branch 'video' into merge

Conflicts:
	arch/arm/configs/omap2plus_defconfig
	arch/arm/mach-omap2/board-4430sdp.c
	arch/arm/mach-omap2/board-omap4panda.c
	arch/arm/mach-omap2/devices.c

Signed-off-by: Vincent Stehlé <v-stehle@ti.com>