]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Mon, 21 May 2012 01:53:04 +0000 (21:53 -0400)
committerDavid S. Miller <davem@davemloft.net>
Mon, 21 May 2012 01:53:04 +0000 (21:53 -0400)
1  2 
drivers/net/ethernet/intel/e1000/e1000_main.c
drivers/net/virtio_net.c
net/core/pktgen.c
net/ipv4/tcp.c

Simple merge
Simple merge
diff --cc net/ipv4/tcp.c
Simple merge