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

From: Stephen Rothwell <[email-masked]>
Date: Mon, 21 Jul 2008 17:20:28 +1000

Hi Alan,

Today's linux-next merge of the ttydev tree got conflicts in
drivers/usb/gadget/serial.c between commit
4d5d46818a74ff3bf7d7cedb9ecc3f0c362a1275 ("usb gadget: use new serial
core") from the usb tree and commit
7ba6ca8da2aca59d29196b7df3f71b0175354644 ("tty-gs-remove-break") from the
ttydev tree.

I used the usb tree version as it seemed to have removed the use of
break_ctl anyway.

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