Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/net-next-2.6
authorDavid S. Miller <davem@davemloft.net>
Tue, 12 Oct 2010 18:43:42 +0000 (11:43 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 12 Oct 2010 18:43:42 +0000 (11:43 -0700)

Trivial merge