]> 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>
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)
commit06fd86b32b499dc6b27ecbc028a3222062c4d02b
treebeafddac0a8098e3f07d2ec60e44a2a7d006e605
parentabb6cd1d1e1d84d22bd48e830805d84acc28dac6
parentaa5310abe0e968e6644635967ff3919c0a5bfce8
Merge git://git.kernel.org/pub/scm/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