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

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

Hi Alan,

Today's linux-next merge of the ttydev tree got a conflict in
drivers/usb/serial/keyspan_pda.c between commit
c81a074df394cba95767e7a8c2bf50c0ba1efd0e ("keyspan_pda: use
request_firmware()") from the firmware tree and commit
657f03fb0d6fa2ceb2c7d5417e7fd8a66df6e028 ("52-tty-tidy-usb-keyspan-pda")
from the ttydev tree.

Same as for keyspan.c.

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