]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'net-next/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 23 Oct 2012 00:34:44 +0000 (11:34 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 23 Oct 2012 00:34:44 +0000 (11:34 +1100)
1  2 
net/ipv4/tcp.c
net/ipv4/tcp_input.c

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