Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/net-next-2.6
authorDavid S. Miller <davem@davemloft.net>
Mon, 15 Nov 2010 18:59:49 +0000 (10:59 -0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 15 Nov 2010 18:59:49 +0000 (10:59 -0800)

Trivial merge