Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Wed, 30 Jul 2014 20:25:49 +0000 (13:25 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 30 Jul 2014 20:25:49 +0000 (13:25 -0700)
commitf139c74a8df071217dcd63f3ef06ae7be7071c4d
tree5711f695577a18a06dbcd0101956e97b388ffa1a
parentbd695a5f0ccf7b38982c426d86055ff3591c9b5b
parent26bcd8b72563b4c54892c4c2a409f6656fb8ae8b
Merge git://git./linux/kernel/git/davem/net

Signed-off-by: David S. Miller <davem@davemloft.net>
13 files changed:
MAINTAINERS
drivers/net/can/c_can/c_can_platform.c
drivers/net/ethernet/amd/xgbe/xgbe-main.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
drivers/net/ethernet/broadcom/genet/bcmgenet.c
drivers/net/hyperv/netvsc.c
drivers/net/phy/phy_device.c
drivers/net/usb/r8152.c
drivers/net/vxlan.c
include/net/ip.h
net/ipv6/ip6_output.c