Merge commit 'v3.3-rc6'
authorTomi Valkeinen <tomi.valkeinen@ti.com>
Tue, 6 Mar 2012 11:20:31 +0000 (13:20 +0200)
committerTomi Valkeinen <tomi.valkeinen@ti.com>
Tue, 6 Mar 2012 11:20:31 +0000 (13:20 +0200)
Merge v3.3-rc6 to get the latest DSS and OMAP arch fixes.

Conflicts:
arch/arm/mach-omap1/board-innovator.c
drivers/video/omap2/dss/apply.c

1  2 
arch/arm/mach-omap2/io.c
arch/arm/plat-omap/common.c
drivers/video/omap2/dss/hdmi.c
drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c

Simple merge
Simple merge
Simple merge