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

Conflicts:
	drivers/net/wireless/libertas_tf/cmd.c
	drivers/net/wireless/libertas_tf/main.c

diff --cc MAINTAINERS
Simple merge

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --cc drivers/net/wireless/libertas_tf/cmd.c
index b620daf59ef7fa3927c3e323779d70d3ec4e49bd,eb85019c1081b863e21e380ed707ee2b06dd1a16..8945afd6ce3ef7e88e182709020660e3183f27d2
--- 1/drivers/net/wireless/libertas_tf/cmd.c
--- 2/drivers/net/wireless/libertas_tf/cmd.c
+++ b/drivers/net/wireless/libertas_tf/cmd.c
@@@ -7,8 -7,8 +7,10 @@@
   *  the Free Software Foundation; either version 2 of the License, or (at
   *  your option) any later version.
   */
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+ 
 +#include <linux/slab.h>
 +
  #include "libertas_tf.h"
  
  static const struct channel_range channel_ranges[] = {

diff --cc drivers/net/wireless/libertas_tf/if_usb.c
index 8cc9db60c14b5c8e52fe8183feac773406cdcbc1,827b7dc306b060a81c855fe03c0da5a9fbb5f8ee..4412c279ca947c58790d5a118dcdb6829af87526
--- 1/drivers/net/wireless/libertas_tf/if_usb.c
--- 2/drivers/net/wireless/libertas_tf/if_usb.c
+++ b/drivers/net/wireless/libertas_tf/if_usb.c
@@@ -11,13 -18,10 +18,11 @@@
  #include <linux/moduleparam.h>
  #include <linux/firmware.h>
  #include <linux/netdevice.h>
 +#include <linux/slab.h>
  #include <linux/usb.h>
  
- #define DRV_NAME "lbtf_usb"
- 
- #include "libertas_tf.h"
- #include "if_usb.h"
+ #define INSANEDEBUG   0
+ #define lbtf_deb_usb2(...) do { if (INSANEDEBUG) lbtf_deb_usbd(__VA_ARGS__); } while (0)
  
  #define MESSAGE_HEADER_LEN    4
  

diff --cc drivers/net/wireless/libertas_tf/main.c
index 7533a23e0500f709368a160d64a3111515d12a56,895b557d664e0accfba2bf82dfd09f1a97bf7820..60787de56f3a9b5865448da2527e34e8751b0924
--- 1/drivers/net/wireless/libertas_tf/main.c
--- 2/drivers/net/wireless/libertas_tf/main.c
+++ b/drivers/net/wireless/libertas_tf/main.c
@@@ -7,10 -7,10 +7,12 @@@
   *  the Free Software Foundation; either version 2 of the License, or (at
   *  your option) any later version.
   */
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+ 
 +#include <linux/slab.h>
 +
+ #include <linux/etherdevice.h>
  #include "libertas_tf.h"
- #include "linux/etherdevice.h"
  
  #define DRIVER_RELEASE_VERSION "004.p0"
  /* thinfirm version: 5.132.X.pX */

diff --cc drivers/net/wireless/mac80211_hwsim.c
Simple merge

diff --cc drivers/net/wireless/mwl8k.c
Simple merge

diff --cc drivers/net/wireless/orinoco/fw.c
Simple merge

diff --cc drivers/net/wireless/orinoco/hw.c
index 741f8cea95b9230f4088167af7ed27822c989ca1,9c86acc42794a63bea16ab10e33a71320d18fca4..6fbd78850123fe100737f5bfec9d69005857d254
--- 1/drivers/net/wireless/orinoco/hw.c
--- 2/drivers/net/wireless/orinoco/hw.c
+++ b/drivers/net/wireless/orinoco/hw.c
@@@ -1086,13 -1087,13 +1087,13 @@@ int __orinoco_hw_set_multicast_list(str
                struct hermes_multicast mclist;
                int i = 0;
  
 -              netdev_for_each_mc_addr(p, dev) {
 +              netdev_for_each_mc_addr(ha, dev) {
                        if (i == mc_count)
                                break;
 -                      memcpy(mclist.addr[i++], p->dmi_addr, ETH_ALEN);
 +                      memcpy(mclist.addr[i++], ha->addr, ETH_ALEN);
                }
  
-               err = hermes_write_ltv(hw, USER_BAP,
+               err = hw->ops->write_ltv(hw, USER_BAP,
                                   HERMES_RID_CNFGROUPADDRESSES,
                                   HERMES_BYTES_TO_RECLEN(mc_count * ETH_ALEN),
                                   &mclist);

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

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

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

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

diff --cc drivers/net/wireless/rt2x00/rt2400pci.c
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt2500pci.c
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt2500usb.c
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt2800lib.c
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt2800usb.c
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt2x00dev.c
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt2x00queue.c
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt61pci.c
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt73usb.c
Simple merge

diff --cc drivers/net/wireless/rtl818x/rtl8180_dev.c
Simple merge

diff --cc drivers/net/wireless/rtl818x/rtl8187_dev.c
Simple merge

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

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

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

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

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

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

diff --cc drivers/ssb/main.c
Simple merge

diff --cc drivers/ssb/pci.c
Simple merge

diff --cc drivers/ssb/sprom.c
Simple merge

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

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

diff --cc net/mac80211/driver-ops.h
Simple merge

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

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

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

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

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

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

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

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

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