Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Sat, 1 Nov 2014 18:53:27 +0000 (14:53 -0400)
committerDavid S. Miller <davem@davemloft.net>
Sat, 1 Nov 2014 18:53:27 +0000 (14:53 -0400)
commit55b42b5ca2dcf143465968697fe6c6503b05fca1
tree91878cd53efc44ba67244d4d3897020828c87c01
parent10738eeaf4ab3de092586cefcc082e7d43ca0044
parentec1f1276022e4e3ca40871810217d513e39ff250
Merge git://git./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>
MAINTAINERS
drivers/net/ethernet/intel/i40e/i40e_main.c
drivers/net/ethernet/mellanox/mlx4/en_tx.c
drivers/net/phy/marvell.c
drivers/net/usb/r8152.c
drivers/net/xen-netback/interface.c
drivers/net/xen-netback/netback.c
net/bridge/br_forward.c
net/core/dev.c
net/dsa/dsa.c
net/ipv6/addrconf.c