Hi Andrew,
Today's linux-next merge of the scsi-post-merge tree got a conflict in
arch/cris/include/asm/serial.h between commit 02016bc0381c ("cris: add
arch/cris/include/asm/serial.h") from Linus' tree and commit f8b20ed71f1b
("Fix the following build errors:") from the akpm tree.
There former appears to be a later version of the latter, so I dropped
the latter.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpxEpE0iYt_f.pgp
Description: PGP signature
