Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/dccp_exp
David S. Miller [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

Simple merge