Subject: Re: linux-next: manual merge of the net tree

From: David Miller <[email-masked]>
Date: Tue, 01 Jul 2008 02:33:25 -0700 (PDT)

From: Stephen Rothwell <[email-masked]>
Date: Tue, 1 Jul 2008 17:19:40 +1000

> Today's linux-next merge of the net tree got a conflict
...

Thanks for the heads up on these two conflicts with the
powerpc tree.

The best seems to let you keep using your resolving, so
that's what I'll let you do :)