Re: pull request: wireless-2.6 2009-11-11

David Miller
2009-11-11T19:40:49Z

From: David Miller <davem@davemloft.net>
Date: Wed, 11 Nov 2009 11:20:31 -0800 (PST)

> From: "John W. Linville" <linville@tuxdriver.com>
> Date: Wed, 11 Nov 2009 12:22:55 -0500
>
>> P.S. Due to the aformentioned iwlwifi fix, this will cause -next
>> conflicts for sfr. You may want to pull net-2.6 into net-next-2.6 after
>> pulling this. The iwlwifi conflicts can be resolved by taking the bigger
>> hunks...
>
> Yep, I noticed this, I'll sort it out, thanks.

I just pushed out the merge to net-next-2.6, please double
check my work.

Thanks!