Hi Greg,
Today's linux-next merge of the usb tree got a conflict in
drivers/net/usb/hso.c between commit
8ef5ba63b94b04b182ac4a6009dbbf1406beb3c5 ("[netdrvr] usb/hso: throttle to
prevent loss of serial data") from Linus' tree and commit
046a038ee4a99eb585313b07dc658a6a444d530e ("HSO: put linefeeds on printk's
in hso.c") from the usb tree.
The former removed some of the code that the latter was modifying.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpnUny6elnlv.pgp
Description: PGP signature
