]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Tue, 23 May 2017 03:32:48 +0000 (23:32 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 23 May 2017 03:32:48 +0000 (23:32 -0400)
1  2 
net/bridge/br_stp_if.c
net/ipv4/tcp.c

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