Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Fri, 16 Aug 2013 22:37:26 +0000 (15:37 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 16 Aug 2013 22:37:26 +0000 (15:37 -0700)
commit2ff1cf12c9fe70e75e600404e6a4274b19d293ed
treebeafddac0a8098e3f07d2ec60e44a2a7d006e605
parent16b304f3404f8e0243d5ee2b70b68767b7b59b2b
parent0f7dd1aa8f959216f1faa71513b9d3c1a9065e5a
Merge git://git./linux/kernel/git/davem/net
26 files changed:
MAINTAINERS
drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
drivers/net/ethernet/broadcom/tg3.c
drivers/net/ethernet/emulex/benet/be_cmds.c
drivers/net/ethernet/emulex/benet/be_cmds.h
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
drivers/net/ethernet/via/via-velocity.c
drivers/net/macvlan.c
drivers/net/macvtap.c
drivers/net/tun.c
drivers/net/vxlan.c
include/net/ip_tunnels.h
include/net/sch_generic.h
include/uapi/linux/snmp.h
net/core/flow_dissector.c
net/core/rtnetlink.c
net/ipv4/ip_gre.c
net/ipv4/proc.c
net/ipv6/ip6_fib.c
net/sctp/associola.c
net/sctp/transport.c
net/vmw_vsock/af_vsock.c