]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitf7c2046844b76b42898faa81a4dd8e14887f35ec
tree8e5f315226b618cb8e050a0c7653c8ec134501e3
parent332ccccf2844b1d90d98a8e88748125f91c6a036
parent45127366b127fd84c21f710c80921fd6a2e83395
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