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

From: Stephen Rothwell <[email-masked]>
Date: Tue, 1 Jul 2008 23:43:27 +1000

Hi Alan,

Today's linux-next merge of the ttydev tree got a conflict in
drivers/usb/serial/ti_usb_3410_5052.c between commit
01f845d09b8fdcdd27ee592422567b8dfa5b14d5 ("ti_usb_3410_5052: use
request_firmware()") from the firmware tree and commits
ce8194a09dee5b7e101467aba6b7cd5617b1cd0f ("23-usb-serial-api-change") and
b002e3f7c9249ddfd1d166cdb76cf7dde8dd93a2 ("62-tty-tidy-usb-ti-usb") from
the ttydev tree.

I fixed it up as best I could.  Definitely worth a look to see if I got
it right.

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