linux-next: manual merge of the omap_dss2 tree with the tree

Hi Tomi,

Today's linux-next merge of the omap_dss2 tree got a conflict in
arch/arm/mach-omap2/omap_hwmod_44xx_data.c between commit
d63bd74fbb5fb2161d9cb90cd7a93a2c5db47c63 ("OMAP4: hwmod data: Add DSS,
DISPC, DSI1&2, RFBI, HDMI and VENC") from the omap tree and commit
cb93d0b00acd5e5ada8ddd4c8719d4aa390515d2 ("OMAP4: hwmod data: add DSS
DISPC DSI1,2 RFBI HDMI VENC") from the omap_dss2 tree.

So these two commits with essentially the same commit messages and author
dates are quite different :-(.  I used the version from the omap tree.
Please sort this out.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/