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

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/boot/dts/at91sam9260.dtsi
Simple merge

diff --cc arch/arm/boot/dts/at91sam9263.dtsi
Simple merge

diff --cc arch/arm/boot/dts/at91sam9g45.dtsi
Simple merge

diff --cc arch/arm/boot/dts/sama5d3_emac.dtsi
Simple merge

diff --cc arch/powerpc/Kconfig
Simple merge

diff --cc arch/s390/kernel/irq.c
Simple merge

diff --cc drivers/net/ethernet/apple/bmac.c
Simple merge

diff --cc drivers/net/ethernet/apple/mace.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bgmac.c
index be059df8c85242ae420de0bd8befcf0a1d58998f,fa8f9e147c34b6ed2c49e4c7679cfb9bcac34298..80070d33b4ee827c2ca872847c4edfb087c9babe
--- 1/drivers/net/ethernet/broadcom/bgmac.c
--- 2/drivers/net/ethernet/broadcom/bgmac.c
+++ b/drivers/net/ethernet/broadcom/bgmac.c
@@@ -14,9 -14,10 +14,10 @@@
  #include <linux/etherdevice.h>
  #include <linux/mii.h>
  #include <linux/phy.h>
+ #include <linux/phy_fixed.h>
  #include <linux/interrupt.h>
  #include <linux/dma-mapping.h>
 -#include <bcm47xx_nvram.h>
 +#include <linux/bcm47xx_nvram.h>
  
  static const struct bcma_device_id bgmac_bcma_tbl[] = {
        BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_4706_MAC_GBIT, BCMA_ANY_REV, BCMA_ANY_CLASS),

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

diff --cc drivers/net/ethernet/sfc/efx.c
Simple merge

diff --cc drivers/net/ethernet/tile/tilegx.c
Simple merge

diff --cc include/linux/brcmphy.h
Simple merge

diff --cc net/9p/trans_fd.c
Simple merge

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

diff --cc net/rds/rds.h
Simple merge

diff --cc net/rds/send.c
Simple merge