Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Mon, 8 Sep 2014 04:41:53 +0000 (21:41 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 8 Sep 2014 04:41:53 +0000 (21:41 -0700)
commiteb84d6b60491a3ca3d90d62ee5346b007770d40d
tree22aadf9ada15e1ae5ba4c400aafab6f2541996e6
parent97a13e5289baa96eaddd06e61d277457d837af3a
parentd030671f3f261e528dc6e396a13f10859a74ae7c
Merge git://git./linux/kernel/git/davem/net
24 files changed:
MAINTAINERS
drivers/net/ethernet/amd/xgbe/xgbe-debugfs.c
drivers/net/ethernet/amd/xgbe/xgbe-dev.c
drivers/net/ethernet/amd/xgbe/xgbe-drv.c
drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
drivers/net/ethernet/amd/xgbe/xgbe-main.c
drivers/net/ethernet/amd/xgbe/xgbe.h
drivers/net/ethernet/broadcom/Kconfig
drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
drivers/net/ethernet/broadcom/cnic.c
drivers/net/ethernet/intel/i40e/i40e_txrx.c
drivers/net/ethernet/intel/i40evf/i40e_txrx.c
drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
drivers/net/phy/phy.c
include/linux/mlx4/device.h
include/linux/netdevice.h
include/net/sock.h
net/core/dev.c
net/core/skbuff.c
net/core/sock.c
net/ipv6/addrconf.c
net/ipv6/mcast.c