Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

Conflicts:
	drivers/net/wireless/ath/ath5k/base.c
	net/mac80211/main.c

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/wireless/ath/ath5k/base.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/eeprom.h
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-core.c
Simple merge

diff --cc drivers/net/wireless/libertas/if_sdio.c
Simple merge

diff --cc drivers/net/wireless/p54/txrx.c
Simple merge

diff --cc net/mac80211/main.c
index 18fdeca,ded5c38..7c85426
--- 1/net/mac80211/main.c
--- 2/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@@ -868,7 -732,12 +868,13 @@@ void ieee80211_unregister_hw(struct iee
  
        rtnl_unlock();
  
+       /*
+        * Now all work items will be gone, but the
+        * timer might still be armed, so delete it
+        */
+       del_timer_sync(&local->work_timer);
+ 
 +      cancel_work_sync(&local->restart_work);
        cancel_work_sync(&local->reconfig_filter);
  
        ieee80211_clear_tx_pending(local);

diff --cc net/mac80211/rx.c
Simple merge

diff --cc net/wireless/core.c
Simple merge

diff --cc net/wireless/wext-core.c
Simple merge