[lkml]   [2011]   [Sep]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Subjectlinux-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.
Stephen Rothwell
[unhandled content-type:application/pgp-signature]
 \ /
  Last update: 2011-09-21 05:05    [W:0.019 / U:3.244 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site