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

From: Stephen Rothwell <[email-masked]>
Date: Tue, 1 Jul 2008 21:33:10 +1000

Hi Alan,

Today's linux-next merge of the ttydev tree got a conflict in
drivers/usb/serial/ftdi_sio.c between commit
0bb08241ce68aaa70b7b804b4d6319d8bad3ae24 ("Tighten up the use of loose")
from the trivial tree and commit ce8194a09dee5b7e101467aba6b7cd5617b1cd0f
("23-usb-serial-api-change") from the ttydev tree.

The conflict is just in a comment.  I have applied the spelling
correction from the former to the version of the file from the ttydev
tree.

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