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

From: Stephen Rothwell <[email-masked]>
Date: Tue, 1 Jul 2008 21:23:53 +1000

Hi Alan,

Today's linux-next merge of the ttydev tree got a conflict in
drivers/usb/serial/digi_acceleport.c between commit
6eccba01fa8ba0cfacca64297fc15f7d4077386e ("USB: remove CVS keywords")
from the usb tree and commit 44234195121820158769cdc2cc92e080dd94d8fe
("34-tty-tidy-usb-digi-acceleport") from the ttydev tree.

The former just removes the CVS annotation in the header comments which
are reformatted in the latter and also removes the CVS annotation.

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