Hi Greg,
Today's linux-next merge of the tty tree got a conflict in
drivers/serial/uartlite.c between commit
52ea4a7ef12f286bd68d13a93daaa688f56a1e14 ("serial: Add CONSOLE_POLL
support for uartlite") from the microblaze tree and commit
0e5176373d9c9a7741b54ce81a9eea342291bdca ("serial: Add CONSOLE_POLL
support for uartlite") from the tty tree.
The same, but slightly different patch. I used the version from the tty
tree.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpvgapQ3dwGd.pgp
Description: PGP signature
