From: David Miller <davem@xxxxxxxxxxxxx> Date: Wed, 11 Nov 2009 11:20:31 -0800 (PST) > From: "John W. Linville" <linville@xxxxxxxxxxxxx> > 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@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
