]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commite32aa74e4b7a1126c412f0cee3f552c8fba74f33
tree91878cd53efc44ba67244d4d3897020828c87c01
parentfc7653ec1c87aa045a4519af72f27a4044d62248
parentff3aac02ecb7edff7260ccd5be691256763b30d8
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>
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