Subject: linux-next: manual merge of the ttydev tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 22 Jul 2008 16:37:54 +1000

Hi Alan,

Today's linux-next merge of the ttydev tree got conflicts in
drivers/char/istallion.c, drivers/char/mxser.c, drivers/char/specialix.c,
drivers/char/synclink_gt.c, drivers/char/tty_io.c,
drivers/usb/gadget/serial.c, drivers/usb/serial/cp2101.c,
drivers/usb/serial/io_ti.c, drivers/usb/serial/ir-usb.c,
drivers/usb/serial/usb-serial.c, include/linux/tty.h and
net/bluetooth/rfcomm/tty.c mainly against Linus' tree.

This is not unexpected since some of the ttydev tree has been merged, so I
will drop it for today in the hope that things are better tomorrow.

-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/