Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

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

The iwlwifi conflict was resolved by keeping the code added
in 'net' that turns off the buggy chip feature.

The MAINTAINERS conflict was merely overlapping changes, one
change updated all the wireless web site URLs and the other
changed some GIT trees to be Johannes's instead of John's.

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

diff --cc MAINTAINERS
index c5fd905,03660de..3075a2a
--- 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/bonding/bond_main.c
Simple merge

diff --cc drivers/net/ethernet/emulex/benet/be_main.c
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
Simple merge

diff --cc drivers/net/phy/mdio_bus.c
Simple merge

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 969f78f,79c6b91..7461a6a
--- 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,23 @@@ static void iwl_tx_start(struct iwl_tra
        iwl_write_prph(trans, SCD_DRAM_BASE_ADDR,
                       trans_pcie->scd_bc_tbls.dma >> 10);
  
 +      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));
 +
+       /* 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);
+ 
++
        /* 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 include/linux/tcp.h
Simple merge

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

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

diff --cc net/ipv6/ip6_fib.c
Simple merge

diff --cc net/ipv6/ip6_output.c
Simple merge

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

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