Merge remote-tracking branch 'net/master'

Conflicts:
	arch/powerpc/configs/40x/hcu4_defconfig
	drivers/net/wireless/iwlwifi/iwl-scan.c
	drivers/s390/cio/qdio_main.c
	net/batman-adv/soft-interface.c

diff --cc MAINTAINERS
Simple merge

diff --cc arch/mips/Kconfig
Simple merge

diff --cc arch/powerpc/Kconfig
Simple merge

diff --cc arch/powerpc/configs/ppc40x_defconfig
Simple merge

diff --cc arch/powerpc/platforms/40x/Kconfig
Simple merge

diff --cc arch/s390/include/asm/qdio.h
Simple merge

diff --cc drivers/net/cris/eth_v10.c
Simple merge

diff --cc drivers/net/ethernet/amd/au1000_eth.c
Simple merge

diff --cc drivers/net/ethernet/amd/au1000_eth.h
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h
Simple merge

diff --cc drivers/net/ethernet/cadence/at91_ether.c
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb3/l2t.c
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb3/l2t.h
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx4/eq.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx4/mr.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx4/port.c
Simple merge

diff --cc drivers/net/ethernet/toshiba/ps3_gelic_net.c
Simple merge

diff --cc drivers/net/ethernet/toshiba/ps3_gelic_net.h
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
Simple merge

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

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

diff --cc drivers/net/wireless/iwlegacy/iwl4965-base.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-scan.c
index 77e528f5db88c438699e5fc2cbe096ad531e267c,fc5af3475392b7bf897844afe54f241b10def001..d879683f69f7324f6378963cc5db9f745d370deb
--- 1/drivers/net/wireless/iwlwifi/iwl-scan.c
--- 2/drivers/net/wireless/iwlwifi/iwl-scan.c
+++ b/drivers/net/wireless/iwlwifi/iwl-scan.c
@@@ -403,8 -413,19 +413,8 @@@ int iwl_mac_hw_scan(struct ieee80211_h
        if (req->n_channels == 0)
                return -EINVAL;
  
-       mutex_lock(&priv->mutex);
+       mutex_lock(&priv->shrd->mutex);
  
 -      if (test_bit(STATUS_SCANNING, &priv->shrd->status) &&
 -          priv->scan_type != IWL_SCAN_NORMAL) {
 -              IWL_DEBUG_SCAN(priv, "Scan already in progress.\n");
 -              ret = -EAGAIN;
 -              goto out_unlock;
 -      }
 -
 -      /* mac80211 will only ask for one band at a time */
 -      priv->scan_request = req;
 -      priv->scan_vif = vif;
 -
        /*
         * If an internal scan is in progress, just set
         * up the scan_request as per above.
@@@ -432,7 -439,8 +442,7 @@@
  
        IWL_DEBUG_MAC80211(priv, "leave\n");
  
-       mutex_unlock(&priv->mutex);
 -out_unlock:
+       mutex_unlock(&priv->shrd->mutex);
  
        return ret;
  }

diff --cc drivers/s390/cio/qdio_main.c
index a122c1c3320f3c0f32af0c913b1b263cc81891dc,9a122280246c1783485af4140d9785cefadca976..7ded1b26fd25615c0c001df9c4182410fadd203f
--- 1/drivers/s390/cio/qdio_main.c
--- 2/drivers/s390/cio/qdio_main.c
+++ b/drivers/s390/cio/qdio_main.c
@@@ -14,6 -14,8 +14,7 @@@
  #include <linux/timer.h>
  #include <linux/delay.h>
  #include <linux/gfp.h>
 -#include <linux/kernel_stat.h>
+ #include <linux/io.h>
  #include <linux/atomic.h>
  #include <asm/debug.h>
  #include <asm/qdio.h>

diff --cc drivers/s390/cio/qdio_setup.c
Simple merge

diff --cc drivers/s390/net/lcs.c
Simple merge

diff --cc drivers/scsi/bnx2fc/bnx2fc.h
Simple merge

diff --cc drivers/scsi/bnx2fc/bnx2fc_fcoe.c
Simple merge

diff --cc drivers/scsi/fcoe/fcoe.c
Simple merge

diff --cc drivers/scsi/fcoe/fcoe_transport.c
Simple merge

diff --cc drivers/staging/Kconfig
Simple merge

diff --cc drivers/staging/Makefile
Simple merge

diff --cc net/batman-adv/soft-interface.c
index 05dd35114a276295d86560e6a877ff12ad6ef60d,aceeabc2ca86dde0b197b217ebae4c6162f49b3d..652fb7b142a6f20d83673b585915ff055b1433b7
--- 1/net/batman-adv/soft-interface.c
--- 2/net/batman-adv/soft-interface.c
+++ b/net/batman-adv/soft-interface.c
@@@ -595,11 -596,12 +596,12 @@@ static int interface_tx(struct sk_buff 
                goto dropped;
  
        /* Register the client MAC in the transtable */
-       tt_local_add(soft_iface, ethhdr->h_source);
+       tt_local_add(soft_iface, ethhdr->h_source, skb->skb_iif);
  
-       orig_node = transtable_search(bat_priv, ethhdr->h_dest);
+       orig_node = transtable_search(bat_priv, ethhdr->h_source,
+                                     ethhdr->h_dest);
 -      if (is_multicast_ether_addr(ethhdr->h_dest) ||
 -                              (orig_node && orig_node->gw_flags)) {
 +      do_bcast = is_multicast_ether_addr(ethhdr->h_dest);
 +      if (do_bcast || (orig_node && orig_node->gw_flags)) {
                ret = gw_is_target(bat_priv, skb, orig_node);
  
                if (ret < 0)

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