Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/net-next-2.6
authorDavid S. Miller <davem@davemloft.net>
Fri, 10 Dec 2010 19:22:57 +0000 (11:22 -0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 10 Dec 2010 19:22:57 +0000 (11:22 -0800)

Trivial merge