projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 17dce5d a3cbdde)
Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/dccp_exp
authorDavid S. Miller <davem@davemloft.net>
Tue, 9 Sep 2008 00:28:59 +0000 (17:28 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 9 Sep 2008 00:28:59 +0000 (17:28 -0700)
Conflicts:

net/dccp/input.c
net/dccp/options.c

1  2 
net/ipv4/tcp_input.c patch | diff1 | diff2 | blob | history

diff --cc net/ipv4/tcp_input.c
Simple merge
John Crispins staging tree