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

From: David Miller <[email-masked]>
Date: Sun, 19 Jun 2011 21:26:02 -0700 (PDT)

From: Simon Horman <[email-masked]>
Date: Mon, 20 Jun 2011 12:39:52 +0900

> I think this should all come out in the wash
> when Dave merges net-2.6 into net-next-2.6.

Indeed, it will.