linux-next: manual merge of the usb tree with the tip tree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
kernel/printk.c between commit 4d09161196c9a836eacea4b36e2f217bc34894cf
("printk: Enable the use of more than one CON_BOOT (early console)") from
the tip tree and commit e289e7dc72eb6bfce70e2722d97a00f5e02893e8 ("USB:
printk: early_printk,console: Allow more than one early console") from
the usb tree.

I assume that these are trying to do (more or less) the same thing.  I
have dropped the one from the usb tree for today.  Please sort this out -
at least remove the usb tree one until you have done so, thanks.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature