Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Sun, 4 Aug 2013 04:36:46 +0000 (21:36 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sun, 4 Aug 2013 04:36:46 +0000 (21:36 -0700)
commit0e76a3a587fc7abda2badf249053b427baad255e
tree646a1da67dc25654552028225ca4b7a0a8043cc9
parentfba3679d34511c42bf452e89dda457a1219eb43a
parent72a67a94bcba71a5fddd6b3596a20604d2b5dcd6
Merge git://git./linux/kernel/git/davem/net

Merge net into net-next to setup some infrastructure Eric
Dumazet needs for usbnet changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
38 files changed:
MAINTAINERS
drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
drivers/net/ethernet/broadcom/tg3.c
drivers/net/ethernet/freescale/fec_main.c
drivers/net/ethernet/intel/ixgbe/ixgbe.h
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
drivers/net/ethernet/marvell/mvneta.c
drivers/net/ethernet/mellanox/mlx4/fw.c
drivers/net/ethernet/mellanox/mlx4/main.c
drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_common.c
drivers/net/ethernet/ti/cpsw.c
drivers/net/macvlan.c
drivers/net/usb/ax88179_178a.c
drivers/net/vxlan.c
include/linux/netdevice.h
include/linux/skbuff.h
include/net/sock.h
net/Kconfig
net/bridge/br_device.c
net/bridge/br_private.h
net/core/neighbour.c
net/core/sock.c
net/ipv4/devinet.c
net/ipv4/sysctl_net_ipv4.c
net/ipv6/addrconf.c
net/ipv6/ip6_fib.c
net/ipv6/ip6mr.c
net/ipv6/route.c
net/sunrpc/svcsock.c