From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Miller Subject: Re: pull request: wireless-2.6 2009-11-11 Date: Wed, 11 Nov 2009 11:41:14 -0800 (PST) Message-ID: <20091111.114114.228545645.davem@davemloft.net> References: <20091111172255.GH4392@tuxdriver.com> <20091111.112031.184370997.davem@davemloft.net> Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: linux-wireless-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: linville-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org Return-path: In-Reply-To: <20091111.112031.184370997.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org> Sender: linux-wireless-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: netdev.vger.kernel.org From: David Miller Date: Wed, 11 Nov 2009 11:20:31 -0800 (PST) > From: "John W. Linville" > 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 linux-wireless" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html