Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into...

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-pci.c
	drivers/net/wireless/wl12xx/main.c

diff --cc MAINTAINERS
Simple merge

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

diff --cc net/mac80211/ibss.c
index 4f9235b,7809895..41f16dd
--- 1/net/mac80211/ibss.c
--- 2/net/mac80211/ibss.c
+++ b/net/mac80211/ibss.c
@@@ -81,10 -81,10 +81,10 @@@ static void __ieee80211_sta_join_ibss(s
        lockdep_assert_held(&ifibss->mtx);
  
        /* Reset own TSF to allow time synchronization work. */
-       drv_reset_tsf(local);
+       drv_reset_tsf(local, sdata);
  
        skb = ifibss->skb;
 -      rcu_assign_pointer(ifibss->presp, NULL);
 +      RCU_INIT_POINTER(ifibss->presp, NULL);
        synchronize_rcu();
        skb->data = skb->head;
        skb->len = 0;

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