On Tue, Mar 09, 2010 at 11:33:44AM -0800, Luis R. Rodriguez wrote: > On Tue, Mar 9, 2010 at 11:05 AM, Michael Sprecher <sprecher.m@xxxxxxxxx> wrote: > > --- > > drivers/net/wireless/ath/ath9k/ani.c | 5 ++- > > drivers/net/wireless/ath/ath9k/ath9k.h | 28 ++++++++-------- > > drivers/net/wireless/ath/ath9k/beacon.c | 6 ++-- > > drivers/net/wireless/ath/ath9k/btcoex.h | 6 ++-- > > drivers/net/wireless/ath/ath9k/calib.c | 15 ++++----- > > drivers/net/wireless/ath/ath9k/calib.h | 4 +- > > drivers/net/wireless/ath/ath9k/common.c | 20 +++++------ > > drivers/net/wireless/ath/ath9k/common.h | 10 +++--- > > drivers/net/wireless/ath/ath9k/debug.c | 12 +++--- > > drivers/net/wireless/ath/ath9k/eeprom.h | 4 +- > > drivers/net/wireless/ath/ath9k/eeprom_4k.c | 16 +++++----- > > drivers/net/wireless/ath/ath9k/eeprom_9287.c | 14 +++++--- > > drivers/net/wireless/ath/ath9k/eeprom_def.c | 31 +++++++++--------- > > drivers/net/wireless/ath/ath9k/gpio.c | 2 +- > > drivers/net/wireless/ath/ath9k/hw.c | 44 +++++++++++-------------- > > drivers/net/wireless/ath/ath9k/hw.h | 22 ++++++------ > > drivers/net/wireless/ath/ath9k/init.c | 6 ++-- > > drivers/net/wireless/ath/ath9k/mac.h | 2 +- > > drivers/net/wireless/ath/ath9k/main.c | 26 +++++++------- > > drivers/net/wireless/ath/ath9k/phy.c | 12 +++---- > > drivers/net/wireless/ath/ath9k/phy.h | 4 +- > > drivers/net/wireless/ath/ath9k/rc.c | 13 +++---- > > drivers/net/wireless/ath/ath9k/rc.h | 4 +- > > drivers/net/wireless/ath/ath9k/recv.c | 5 +-- > > drivers/net/wireless/ath/ath9k/reg.h | 22 ++++++------ > > drivers/net/wireless/ath/ath9k/virtual.c | 3 +- > > drivers/net/wireless/ath/ath9k/xmit.c | 11 +++--- > > 27 files changed, 167 insertions(+), 180 deletions(-) > > Thanks a lot! Unfortunately right now we have two large patch bombs > pending integration which would likely conflict with your patch. One > set which I hope we can get into 2.6.34-rc2, the ath9k_htc driver. > Then after that I have an already accumulated set of patches (count is > at 10 right now) for AR93xx work. The ar93xx work is not intended for > 2.6.34 though so I could rebase my work on top of yours but lets first > see ath9k_htc get merged first and decide then. > > So NACK for now. I think it is safe to rebase this now, if you are still interested... :-) John -- John W. Linville Someday the world will need a hero, and you linville@xxxxxxxxxxxxx might be all we have. Be ready. -- 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
