Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/usb/serial/ftdi_sio.c between commit
43b11d33f2c20c33fcf197780edb2e5d8a1b6a67 ("ftdi: A few errors are err()
that should be debug which causes much spewage") from Linus' tree and
commit 1e5778f3c11989c36ca25e60dc3ecf14af3a4c99 ("USB: remove use of err
() in drivers/usb/serial") from the usb tree.

I used the versions from Linus tree for now.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/