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

From: David Miller <[email-masked]>
Date: Fri, 22 May 2009 01:10:15 -0700 (PDT)

From: "John W. Linville" <[email-masked]>
Date: Thu, 21 May 2009 20:35:47 -0400

> I think what Stephen has done is good for now.  I'll probably post
> a pull request for wireless-next-2.6 tommorrow.

Ok.

Once I pull that in I'll pull net-2.6 into net-next-2.6 to resolve
all of the merge issues fully.