Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/net-next-2.6
authorDavid S. Miller <davem@davemloft.net>
Mon, 10 Jan 2011 00:16:57 +0000 (16:16 -0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 10 Jan 2011 00:16:57 +0000 (16:16 -0800)

Trivial merge