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)
commit0a68a20cc3eafa73bb54097c28b921147d7d3685
tree8e5f315226b618cb8e050a0c7653c8ec134501e3
parent17dce5dfe38ae2fb359b61e855f5d8a3a8b7892b
parenta3cbdde8e9c38b66b4f13ac5d6ff1939ded0ff20
Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/dccp_exp

Conflicts:

net/dccp/input.c
net/dccp/options.c
net/ipv4/tcp_input.c