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

Conflicts:
	MAINTAINERS
	drivers/net/wireless/iwlwifi/pcie/trans.c

diff --cc MAINTAINERS
index c5fd905206e79f24e8a53e6280e4480572844b2d,03660de94cf7608edddbdfbd1bc71621bfcad9e0..3075a2a295119f704fe1b981bde1781d3ca89dcf
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -4339,8 -4342,9 +4342,9 @@@ F:      arch/m68k/hp300
  MAC80211
  M:    Johannes Berg <johannes@sipsolutions.net>
  L:    linux-wireless@vger.kernel.org
 -W:    http://linuxwireless.org/
 +W:    http://wireless.kernel.org/
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git
  S:    Maintained
  F:    Documentation/networking/mac80211-injection.txt
  F:    include/net/mac80211.h
@@@ -4350,8 -4354,9 +4354,9 @@@ MAC80211 PID RATE CONTRO
  M:    Stefano Brivio <stefano.brivio@polimi.it>
  M:    Mattias Nissler <mattias.nissler@gmx.de>
  L:    linux-wireless@vger.kernel.org
 -W:    http://linuxwireless.org/en/developers/Documentation/mac80211/RateControl/PID
 +W:    http://wireless.kernel.org/en/developers/Documentation/mac80211/RateControl/PID
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git
  S:    Maintained
  F:    net/mac80211/rc80211_pid*
  

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

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

diff --cc drivers/net/wireless/iwlwifi/pcie/6000.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/pcie/trans.c
index 1eabb834e32aa061568e2849d69bb5da39664c37,79c6b91417f9430c2982b4e51aefd8f3f7dc47b3..69dece5abb2f4b82a78d1828d0b86ae1577c2ef7
--- 1/drivers/net/wireless/iwlwifi/pcie/trans.c
--- 2/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
@@@ -1054,17 -1058,11 +1054,22 @@@ static void iwl_tx_start(struct iwl_tra
        iwl_write_prph(trans, SCD_DRAM_BASE_ADDR,
                       trans_pcie->scd_bc_tbls.dma >> 10);
  
+       /* The chain extension of the SCD doesn't work well. This feature is
+        * enabled by default by the HW, so we need to disable it manually.
+        */
+       iwl_write_prph(trans, SCD_CHAINEXT_EN, 0);
+ 
 +      for (i = 0; i < trans_pcie->n_q_to_fifo; i++) {
 +              int fifo = trans_pcie->setup_q_to_fifo[i];
 +
 +              __iwl_trans_pcie_txq_enable(trans, i, fifo, IWL_INVALID_STATION,
 +                                          IWL_TID_NON_QOS,
 +                                          SCD_FRAME_LIMIT, 0);
 +      }
 +
 +      /* Activate all Tx DMA/FIFO channels */
 +      iwl_trans_txq_set_sched(trans, IWL_MASK(0, 7));
 +
        /* Enable DMA channel */
        for (chan = 0; chan < FH_TCSR_CHNL_NUM ; chan++)
                iwl_write_direct32(trans, FH_TCSR_CHNL_TX_CONFIG_REG(chan),

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

diff --cc net/nfc/llcp/sock.c
Simple merge