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

From: David Miller <[email-masked]>
Date: Wed, 29 Apr 2009 20:23:26 -0700 (PDT)

From: "John W. Linville" <[email-masked]>
Date: Wed, 29 Apr 2009 22:16:35 -0400

> Yes, this looks correct -- please resolve the equivalent net-2.6 ->
> net-next-2.6 conflict this way too, Dave.

Will do, thanks.