From: "John W. Linville" <linville@xxxxxxxxxxxxx> Date: Fri, 24 Apr 2009 16:05:05 -0400 > Here is a huge pull request for net-next-2.6, the first one this > cycle. There is the usual huge round of driver and mac80211 updates. > Among other things is some movement of code to enable sharing some bits > between ath5k, ath9k, and ar9170. Also included is the beginngin of > migration of rndis_wlan to the cfg80211 API, the first non-mac80211 > driver to do that. > > Please let me know if there are problems! Since I had pulled net-2.6 into net-next-2.6, aparently after you built this tree, there was a conflict to deal with in net/mac80211/pm.c I hope I got it right ;-) Pulled, thanks a lot! -- 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