lkml.org 
[lkml]   [2010]   [Sep]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the tty tree with the microblaze tree
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@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2010-09-03 05:05    [W:0.041 / U:0.136 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site