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

From: Stephen Rothwell <[email-masked]>
Date: Fri, 18 Jul 2008 18:28:37 +1000

Hi Alan,

Today's linux-next merge of the ttydev tree got a conflict in
drivers/usb/serial/cp2101.c between commit
b147c3a769995335107b4cd674bd2d1e1493ddfb ("USB: cp2101.c fix sparse
signedness mismatch warnings") from the usb tree and commit
255ba432f804717e8a2d6096aa2d92e970f61c3d ("usb-serial-api-change") from
the ttydev tree.

I did the obvious fixup and can carry it.  (the conflict is below)
-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/