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

Conflicts:
	drivers/net/phy/marvell.c

Simple overlapping changes in drivers/net/phy/marvell.c

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/intel/i40e/i40e_main.c
Simple merge

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

diff --cc drivers/net/phy/marvell.c
index 3e3d7ca,225c033..bb4d780
--- 1/drivers/net/phy/marvell.c
--- 2/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@@ -54,10 -54,11 +54,14 @@@
  #define MII_M1145_PHY_EXT_CR          0x14
  #define MII_M1145_RGMII_RX_DELAY      0x0080
  #define MII_M1145_RGMII_TX_DELAY      0x0002
 +#define MII_M1145_HWCFG_MODE_SGMII_NO_CLK     0x4
 +#define MII_M1145_HWCFG_MODE_MASK             0xf
 +#define MII_M1145_HWCFG_FIBER_COPPER_AUTO     0x8000
  
+ #define MII_M1145_HWCFG_MODE_SGMII_NO_CLK     0x4
+ #define MII_M1145_HWCFG_MODE_MASK             0xf
+ #define MII_M1145_HWCFG_FIBER_COPPER_AUTO     0x8000
+ 
  #define MII_M1111_PHY_LED_CONTROL     0x18
  #define MII_M1111_PHY_LED_DIRECT      0x4100
  #define MII_M1111_PHY_LED_COMBINE     0x411c

diff --cc drivers/net/usb/r8152.c
Simple merge

diff --cc drivers/net/xen-netback/interface.c
Simple merge

diff --cc drivers/net/xen-netback/netback.c
Simple merge

diff --cc net/bridge/br_forward.c
Simple merge

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

diff --cc net/dsa/dsa.c
Simple merge

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