Merge remote-tracking branch 'net-next/master'

Conflicts:
	arch/powerpc/configs/40x/hcu4_defconfig
	drivers/s390/cio/qdio_main.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/can/mscan/mscan.c
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.h
Simple merge

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

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

diff --cc drivers/net/ethernet/mellanox/mlx4/en_tx.c
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/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