[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date: Wed, 11 Nov 2009 11:41:14 -0800 (PST)
From: David Miller <davem@...emloft.net>
To: linville@...driver.com
Cc: linux-wireless@...r.kernel.org, netdev@...r.kernel.org,
linux-kernel@...r.kernel.org
Subject: Re: pull request: wireless-2.6 2009-11-11
From: David Miller <davem@...emloft.net>
Date: Wed, 11 Nov 2009 11:20:31 -0800 (PST)
> From: "John W. Linville" <linville@...driver.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!
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists