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

From: Stephen Rothwell <[email-masked]>
Date: Wed, 2 Jul 2008 00:09:51 +1000

Hi Alan,

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

The former removed the file.

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