Messages in this thread | | | Date | Mon, 26 Nov 2012 16:22:33 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the omap_dss2 tree with Linus' tree |
| |
Hi Tomi,
Today's linux-next merge of the omap_dss2 tree got a conflict in drivers/video/omap2/dss/dss.c between commit f65e384bec59 ("omapdss: dss: Fix clocks on OMAP363x") from Linus' tree and commit bd81ed081887 ("OMAPDSS: DSS: use omapdss_version") from the omap_dss2 tree.
I fixed it up (using the omap_dss2 tree version) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |