Messages in this thread | | | Date | Tue, 25 Oct 2011 19:18:40 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the tty tree with Linus' tree |
| |
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/ [unhandled content-type:application/pgp-signature] | |