Merge remote-tracking branch 'net/master'

Conflicts:
	MAINTAINERS
	arch/powerpc/configs/40x/hcu4_defconfig
	drivers/s390/cio/qdio_main.c

diff --cc MAINTAINERS
index 7a283f8e3f6750c9e1093201b33624dfe295cea0,579713ef7cfb4e750944c584a599fc3874bf0b42..c186fc871e1b036261b892ba3dba306c257753d6
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1573,9 -1574,10 +1573,9 @@@ F:     drivers/scsi/bfa
  
  BROCADE BNA 10 GIGABIT ETHERNET DRIVER
  M:    Rasesh Mody <rmody@brocade.com>
 -M:    Debashis Dutt <ddutt@brocade.com>
  L:    netdev@vger.kernel.org
  S:    Supported
- F:    drivers/net/bna/
+ F:    drivers/net/ethernet/brocade/bna/
  
  BSG (block layer generic sg v4 driver)
  M:    FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>

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/bcma/main.c
Simple merge

diff --cc drivers/infiniband/ulp/ipoib/ipoib_main.c
Simple merge

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

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

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

diff --cc drivers/net/ethernet/ibm/ibmveth.c
Simple merge

diff --cc drivers/net/ethernet/renesas/sh_eth.c
Simple merge

diff --cc drivers/net/ethernet/sun/cassini.c
Simple merge

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

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

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

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

diff --cc drivers/net/wireless/iwlegacy/iwl-3945-rs.c
Simple merge

diff --cc drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
Simple merge

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

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 include/net/cfg80211.h
Simple merge

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

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

diff --cc net/ipv4/igmp.c
Simple merge

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

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

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

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

diff --cc net/socket.c
Simple merge