Subject: linux-next: net-current/net merge conflict

From: Stephen Rothwell <[email-masked]>
Date: Mon, 26 May 2008 13:32:34 +1000

Hi Dave, Jeff,

Today's linux-next merge of the net tree got a trivial conflict in
drivers/net/cpmac.c between commit
f917d58031fce6dfd7cea71259ea6a2b663ec813 ("cpmac bugfixes and
enhancements") from the net-current tree and commit
7d2e3cb7000b883a8e489485ac249be572fe17b1 ("[netdrvr] Trim trailing
whitespace for several drivers") from the net tree. The former removed a
comment that the latter made a whitespace fix to.

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