Merge tag 'mac80211-next-for-davem-2016-02-26' of git://git.kernel.org/pub/scm/linux...

Johannes Berg says:

====================
Here's another round of updates for -next:
 * big A-MSDU RX performance improvement (avoid linearize of paged RX)
 * rfkill changes: cleanups, documentation, platform properties
 * basic PBSS support in cfg80211
 * MU-MIMO action frame processing support
 * BlockAck reordering & duplicate detection offload support
 * various cleanups & little fixes
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --cc drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/mvm/d3.c
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
Simple merge

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

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

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

diff --cc drivers/staging/vt6656/rxtx.c
Simple merge

diff --cc net/mac80211/debugfs.c
index 3e24d0ddb51bfaca18d39669e41dba2bb6a91bb5,e433d0c97e86118394cd39c663f3531fd1145a75..4ab5c522ceeeee5def93f869fd96618999a2daf5
--- 1/net/mac80211/debugfs.c
--- 2/net/mac80211/debugfs.c
+++ b/net/mac80211/debugfs.c
@@@ -126,6 -126,10 +126,7 @@@ static const char *hw_flag_names[] = 
        FLAG(SUPPORTS_AMSDU_IN_AMPDU),
        FLAG(BEACON_TX_STATUS),
        FLAG(NEEDS_UNIQUE_STA_ADDR),
 -
 -      /* keep last for the build bug below */
 -      (void *)0x1
+       FLAG(SUPPORTS_REORDERING_BUFFER),
  #undef FLAG
  };
  

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

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

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

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

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

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

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

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