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

From: Stephen Rothwell <[email-masked]>
Date: Thu, 11 Mar 2010 14:04:09 +1100

Hi Bruno,

On Thu, 11 Mar 2010 11:38:11 +0900 Bruno Randolf <[email-masked]> wrote:
>
> not sure what happened...
> 
> but wireless-next-2.6.git 86415d43efd4f7093979cfa8a80232114266f1a4 is an older 
> version of my patch. i have sent one which applies cleanly later on.

The tree I call wireless-current usually only contains bug fixes, the
tree I call wireless is stuff for the next release ...

> your fix is correct, though.

Thanks for the confirmation.

-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/