Hi Alan, On Thu, 12 Mar 2009 09:44:34 +0000 Alan Cox <alan@xxxxxxxxxxxxxxxxxxx> wrote: > > > Today's linux-next merge of the ttydev tree got conflicts in > > drivers/usb/serial/ftdi_sio.c and drivers/usb/serial/ftdi_sio.h. It > > looks like the same two patches have been applied to the ttydev > > (tty-ftdi-gnice, tty-ftdi-dresdenelec) and the usb.current (USB: serial: > > These are USB identifier updates to a USB driver that's also a tty > driver. I'll drop them in favour of GregKH's tree carring them. OK, thanks. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgpLP8Kt0vZn4.pgp
Description: PGP signature
