Merge commit 'v3.3-rc4'

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

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

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

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

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

diff --cc drivers/video/omap2/dss/ti_hdmi.h
Simple merge

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

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