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

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

Hi Alan,

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 wireless tree and commit 08bec19ee22b6d02bf354323e6b5a3e61070c04a
("tty-fix-strip") from the ttydev tree.

I just removed the file for now.

I think I remember some discussion of this a while ago ...
-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/