linux-next: manual merge of the ttydev tree

Hi Alan,

Today's linux-next merge of the ttydev tree got a conflict in
drivers/usb/serial/airprime.c between commit
0cc220d6bfe0d92843868a8dd4f0bd427fe6d8e2 ("USB: delete airprime driver")
from the usb tree and commit 255ba432f804717e8a2d6096aa2d92e970f61c3d
("usb-serial-api-change") from the ttydev tree.

I just removed the file.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/