lkml.org 
[lkml]   [2012]   [Nov]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-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]
\
 
 \ /
  Last update: 2012-11-26 07:01    [W:0.033 / U:0.064 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site