Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/net-next-2.6
authorDavid S. Miller <davem@davemloft.net>
Tue, 2 Aug 2011 00:37:22 +0000 (17:37 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 2 Aug 2011 00:37:22 +0000 (17:37 -0700)

Trivial merge