]> 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>
Tue, 10 Dec 2013 01:20:14 +0000 (20:20 -0500)
committerDavid S. Miller <davem@davemloft.net>
Tue, 10 Dec 2013 01:20:14 +0000 (20:20 -0500)
commitcfc26e22bb9474c119fe5b988d0df4bec38a11c0
tree6c78386b3db9dd47fd2b79efb4dcf8c1472de99e
parent154b5cbf17b0d4dd66ce1ad2e7f9303a72c0e326
parent803148cbfb83b363527b72cd2f1ff06e5cf2e823
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Merge 'net' into 'net-next' to get the AF_PACKET bug fix that
Daniel's direct transmit changes depend upon.

Signed-off-by: David S. Miller <davem@davemloft.net>
MAINTAINERS
drivers/net/bonding/bond_sysfs.c
drivers/net/ethernet/nvidia/forcedeth.c
drivers/net/macvtap.c
drivers/net/tun.c
drivers/net/virtio_net.c
net/packet/af_packet.c
net/sched/act_skbedit.c
net/sctp/transport.c