Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/net-next-2.6
authorDavid S. Miller <davem@davemloft.net>
Thu, 16 Sep 2010 03:21:48 +0000 (20:21 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 16 Sep 2010 03:21:48 +0000 (20:21 -0700)

Trivial merge