Messages in this thread | | | Date | Wed, 21 Sep 2011 13:02:22 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the omap_dss2 tree with the arm tree |
| |
Hi Tomi,
Today's linux-next merge of the omap_dss2 tree got a conflict in drivers/video/omap/lcd_apollon.c drivers/video/omap/lcd_ldp.c drivers/video/omap/lcd_overo.c between commit 1bc857f700fb ("ARM: gpio: omap: convert drivers to use asm/gpio.h rather than mach/gpio.h") from the arm tree and commits db3136b14a2b ("OMAPFB: Remove unused lcd drivers") and 0cde58449424 ("OMAPDSS: Port the Apollon display driver to DSS2") from the omap_dss2 tree.
The latter two commist removed these files, so I did that. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |