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

Conflicts:
	Documentation/feature-removal-schedule.txt
	drivers/net/wireless/ath/ath5k/phy.c
	drivers/net/wireless/wl12xx/wl1271_main.c

diff --cc Documentation/feature-removal-schedule.txt
index 267e90582d20bbe0126a9656b894aa32fd57dbd0,5f460110c5ee69b521609b8f83b39d14912bb26f..116a13c4f13f701e48f384d92e8174c41fe10e5c
--- 1/Documentation/feature-removal-schedule.txt
--- 2/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@@ -572,39 -571,23 +571,60 @@@ Who:    Jan Kiszka <[email protected]
  
  ----------------------------
  
 -
 -----------------------------
 +What: KVM memory aliases support
 +When: July 2010
 +Why:  Memory aliasing support is used for speeding up guest vga access
 +      through the vga windows.
 +
 +      Modern userspace no longer uses this feature, so it's just bitrotted
 +      code and can be removed with no impact.
 +Who:  Avi Kivity <[email protected]>
 +
 +----------------------------
 +
 +What: KVM kernel-allocated memory slots
 +When: July 2010
 +Why:  Since 2.6.25, kvm supports user-allocated memory slots, which are
 +      much more flexible than kernel-allocated slots.  All current userspace
 +      supports the newer interface and this code can be removed with no
 +      impact.
 +Who:  Avi Kivity <[email protected]>
 +
 +----------------------------
 +
 +What: KVM paravirt mmu host support
 +When: January 2011
 +Why:  The paravirt mmu host support is slower than non-paravirt mmu, both
 +      on newer and older hardware.  It is already not exposed to the guest,
 +      and kept only for live migration purposes.
 +Who:  Avi Kivity <[email protected]>
 +
 +----------------------------
 +
 +What:         "acpi=ht" boot option
 +When: 2.6.35
 +Why:  Useful in 2003, implementation is a hack.
 +      Generally invoked by accident today.
 +      Seen as doing more harm than good.
 +Who:  Len Brown <[email protected]>
++
++----------------------------
++
+ What: iwlwifi 50XX module parameters
+ When: 2.6.40
+ Why:  The "..50" modules parameters were used to configure 5000 series and
+       up devices; different set of module parameters also available for 4965
+       with same functionalities. Consolidate both set into single place
+       in drivers/net/wireless/iwlwifi/iwl-agn.c
+ 
+ Who:  Wey-Yi Guy <[email protected]>
+ 
+ ----------------------------
+ 
+ What: iwl4965 alias support
+ When: 2.6.40
+ Why:  Internal alias support has been present in module-init-tools for some
+       time, the MODULE_ALIAS("iwl4965") boilerplate aliases can be removed
+       with no impact.
+ 
+ Who:  Wey-Yi Guy <[email protected]>

diff --cc drivers/net/wireless/ath/ar9170/main.c
index 7c4a7d84535cfb902a0b8a92b2d8b3d094c1340e,fed6695ec04e4c1046cb43304f27b2bd25c5e269..0312cee395703c38c34835aa0fa180877fbe9e62
--- 1/drivers/net/wireless/ath/ar9170/main.c
--- 2/drivers/net/wireless/ath/ar9170/main.c
+++ b/drivers/net/wireless/ath/ar9170/main.c
@@@ -2509,10 -2513,10 +2510,10 @@@ void *ar9170_alloc(size_t priv_size
        /*
         * this buffer is used for rx stream reconstruction.
         * Under heavy load this device (or the transport layer?)
 -       * tends to split the streams into seperate rx descriptors.
 +       * tends to split the streams into separate rx descriptors.
         */
  
-       skb = __dev_alloc_skb(AR9170_MAX_RX_BUFFER_SIZE, GFP_KERNEL);
+       skb = __dev_alloc_skb(AR9170_RX_STREAM_MAX_SIZE, GFP_KERNEL);
        if (!skb)
                goto err_nomem;
  

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

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

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

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

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

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

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

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

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

diff --cc drivers/net/wireless/ipw2x00/ipw2200.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-3945-rs.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-calib.c
Simple merge

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

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

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

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

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

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

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

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

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

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

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

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

diff --cc drivers/net/wireless/prism54/islpci_dev.c
Simple merge

diff --cc drivers/net/wireless/prism54/islpci_eth.c
Simple merge

diff --cc drivers/net/wireless/prism54/islpci_mgt.c
Simple merge

diff --cc drivers/net/wireless/prism54/oid_mgt.c
Simple merge

diff --cc drivers/net/wireless/ray_cs.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/rt61pci.c
Simple merge

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

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

diff --cc drivers/net/wireless/wl12xx/wl1251_spi.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_init.c
Simple merge

diff --cc drivers/net/wireless/wl12xx/wl1271_main.c
index aa970b759dd564dd8d50d71a4f584078827389df,283d5dade1ae194fb255c7d8d14a3002d12e004e..814f300c3f176108db4c7c64719cd30896efe428
--- 1/drivers/net/wireless/wl12xx/wl1271_main.c
--- 2/drivers/net/wireless/wl12xx/wl1271_main.c
+++ b/drivers/net/wireless/wl12xx/wl1271_main.c
@@@ -1267,11 -1304,15 +1305,16 @@@ struct wl1271_filter_params 
        u8 mc_list[ACX_MC_ADDRESS_GROUP_MAX][ETH_ALEN];
  };
  
 -static u64 wl1271_op_prepare_multicast(struct ieee80211_hw *hw, int mc_count,
 -                                     struct dev_addr_list *mc_list)
 +static u64 wl1271_op_prepare_multicast(struct ieee80211_hw *hw,
 +                                     struct netdev_hw_addr_list *mc_list)
  {
        struct wl1271_filter_params *fp;
 +      struct netdev_hw_addr *ha;
+       struct wl1271 *wl = hw->priv;
+       int i;
+ 
+       if (unlikely(wl->state == WL1271_STATE_OFF))
+               return 0;
  
        fp = kzalloc(sizeof(*fp), GFP_ATOMIC);
        if (!fp) {

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

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

diff --cc include/linux/mmc/sdio.h
index 0ebaef577ff59ef0666e68357f4e61fa08f2a864,118f0295a575c81af69aa179d588a450f881a193..329a8faa6e37bb32bd6e65f1b8fd758ac45baa36
--- 1/include/linux/mmc/sdio.h
--- 2/include/linux/mmc/sdio.h
+++ b/include/linux/mmc/sdio.h
@@@ -94,9 -94,9 +94,11 @@@
  
  #define  SDIO_BUS_WIDTH_1BIT  0x00
  #define  SDIO_BUS_WIDTH_4BIT  0x02
+ #define  SDIO_BUS_ECSI                0x20    /* Enable continuous SPI interrupt */
+ #define  SDIO_BUS_SCSI                0x40    /* Support continuous SPI interrupt */
  
 +#define  SDIO_BUS_ASYNC_INT   0x20
 +
  #define  SDIO_BUS_CD_DISABLE     0x80 /* disable pull-up on DAT3 (pin 1) */
  
  #define SDIO_CCCR_CAPS                0x08

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

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

diff --cc net/mac80211/agg-tx.c
Simple merge

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

diff --cc net/mac80211/debugfs_netdev.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
Simple merge

diff --cc net/mac80211/mesh_plink.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/mlme.c
Simple merge

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

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

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

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