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

From: Stephen Rothwell <[email-masked]>
Date: Tue, 1 Jul 2008 22:35:25 +1000

Hi Alan,

Today's linux-next merge of the ttydev tree got a conflict in
drivers/usb/serial/keyspan.c between commit
722051ff031346b1afd9008455d0b7eacfaa7c36 ("keyspan: use request_firmware
()") from the firmware tree and commit
ce8194a09dee5b7e101467aba6b7cd5617b1cd0f ("23-usb-serial-api-change")
from the ttydev tree.

The only real conflict was with the includes.  For the rest, I put the
firmware changes in over the tidyups.

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