Merge commit 'v3.3-rc1' into fbdev-next

diff --cc arch/arm/mach-omap2/board-4430sdp.c
Simple merge

diff --cc arch/arm/mach-omap2/board-omap4panda.c
Simple merge

diff --cc arch/arm/mach-omap2/display.c
Simple merge

diff --cc drivers/video/intelfb/intelfbdrv.c
Simple merge

diff --cc drivers/video/omap2/dss/dsi.c
Simple merge