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

From: Jeff Garzik <[email-masked]>
Date: Mon, 26 May 2008 16:27:36 -0400

On Mon, May 26, 2008 at 01:32:34PM +1000, Stephen Rothwell wrote:
> 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.

Please make sure to CC my author email address.  [email-masked] is
only for legal sign-offs.

	Jeff