linux-next: manual merge of the omap_dss2 tree
From: Mark Brown <broonie@kernel.org>
Date: 2013-10-10 17:50:30
Also in:
linux-next, linux-omap, lkml
Today's linux-next merge of the omap_dss2 tree got conflicts in drivers/video/omap2/dss/hdmi4_core.[ch] caused by ef26958a (omapdss: HDMI: Rename hdmi driver files to nicer names) interacting with a range of commits from Ricardo Neri in the fbdev tree and possibly some other stuff. git is unfortunately not giving me a useful diff right now :/
Attachments
- signature.asc [application/pgp-signature] 836 bytes