* linux-next: manual merge of the omap_dss2 tree with the arm tree
@ 2011-09-21 3:02 Stephen Rothwell
2011-09-21 6:13 ` Tomi Valkeinen
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2011-09-21 3:02 UTC (permalink / raw)
To: Tomi Valkeinen; +Cc: linux-next, linux-kernel, Russell King
[-- Attachment #1: Type: text/plain, Size: 629 bytes --]
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/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the omap_dss2 tree with the arm tree
2011-09-21 3:02 linux-next: manual merge of the omap_dss2 tree with the arm tree Stephen Rothwell
@ 2011-09-21 6:13 ` Tomi Valkeinen
0 siblings, 0 replies; 2+ messages in thread
From: Tomi Valkeinen @ 2011-09-21 6:13 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Russell King
On Wed, 2011-09-21 at 13:02 +1000, Stephen Rothwell wrote:
> 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.
Thanks, this is also correct.
Tomi
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-09-21 6:20 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-21 3:02 linux-next: manual merge of the omap_dss2 tree with the arm tree Stephen Rothwell
2011-09-21 6:13 ` Tomi Valkeinen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox