linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: manual merge of the tty tree with Linus' tree
@ 2011-10-25  8:18 Stephen Rothwell
  2011-10-25 10:03 ` Nicolas Ferre
  0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2011-10-25  8:18 UTC (permalink / raw)
  To: Greg KH; +Cc: linux-next, linux-kernel, Voss, Nikolaus, Nicolas Ferre

[-- Attachment #1: Type: text/plain, Size: 482 bytes --]

Hi Greg,

Today's linux-next merge of the tty tree got a conflict in
drivers/tty/serial/atmel_serial.c between commit 0d0a3cc183c5
("atmel_serial: fix atmel_default_console_device") from Linus' tree and
commit 4cbf9f4864bd ("tty/serial: atmel_serial: auto-enumerate ports")
from the tty tree.

I just used the tty tree version (which may not be completely correct).
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2011-10-25 10:08 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-10-25  8:18 linux-next: manual merge of the tty tree with Linus' tree Stephen Rothwell
2011-10-25 10:03 ` Nicolas Ferre
2011-10-25 10:05   ` [PATCH] tty/serial: atmel_serial: fixup merge conflict Nicolas Ferre

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).