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

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

Hi ,

Today's linux-next merge of the ttydev tree got a conflict in
drivers/net/wireless/strip.c between commit
94d9842403f770239a656586442454b7a8f2df29 ("remove the strip driver") from
the net tree and commit 7636d4eb65deca18568e3ec4bfa65b85078042ce
("01-ldisc-ref") from the ttydev tree.

The former removed the file.

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