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

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

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

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

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

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

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

diff --cc drivers/net/wireless/iwlwifi/iwl-dev.h
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl3945-base.c
Simple merge

diff --cc drivers/net/wireless/iwmc3200wifi/rx.c
Simple merge

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

diff --cc drivers/net/wireless/libertas/dev.h
Simple merge

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

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

diff --cc drivers/net/wireless/wl12xx/wl1251_main.c
Simple merge

diff --cc include/linux/ieee80211.h
Simple merge

diff --cc include/net/mac80211.h
Simple merge

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

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

diff --cc net/mac80211/ieee80211_i.h
Simple merge

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

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

diff --cc net/mac80211/mesh_hwmp.c
index d28acb6,664f5cc..ce84237
--- 1/net/mac80211/mesh_hwmp.c
--- 2/net/mac80211/mesh_hwmp.c
+++ b/net/mac80211/mesh_hwmp.c
@@@ -937,9 -937,9 +937,9 @@@ int mesh_nexthop_lookup(struct sk_buff 
  
        if (mpath->flags & MESH_PATH_ACTIVE) {
                if (time_after(jiffies,
 -                             mpath->exp_time +
 +                             mpath->exp_time -
                               msecs_to_jiffies(sdata->u.mesh.mshcfg.path_refresh_time)) &&
-                   !memcmp(sdata->dev->dev_addr, hdr->addr4, ETH_ALEN) &&
+                   !memcmp(sdata->vif.addr, hdr->addr4, ETH_ALEN) &&
                    !(mpath->flags & MESH_PATH_RESOLVING) &&
                    !(mpath->flags & MESH_PATH_FIXED)) {
                        mesh_queue_preq(mpath,

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

diff --cc net/mac80211/mlme.c
index c79e59f,5174bfc..2f9ed8b
--- 1/net/mac80211/mlme.c
--- 2/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@@ -1407,10 -1459,9 +1466,10 @@@ ieee80211_rx_mgmt_disassoc(struct ieee8
        reason_code = le16_to_cpu(mgmt->u.disassoc.reason_code);
  
        printk(KERN_DEBUG "%s: disassociated from %pM (Reason: %u)\n",
-                       sdata->dev->name, mgmt->sa, reason_code);
+                       sdata->name, mgmt->sa, reason_code);
  
        ieee80211_set_disassoc(sdata, false);
 +      ieee80211_recalc_idle(sdata->local);
        return RX_MGMT_CFG80211_DISASSOC;
  }
  

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

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

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

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

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