From: David S. Miller <davem@davemloft.net>
Date: Mon, 10 Jan 2011 00:16:57 +0000 (-0800)
Subject: Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/net-next-2.6
X-Git-Tag: v2.6.38-rc1~403^2~49
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=14934efab62201c176c620bd598b34b59acb6796;p=linux.git

Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/net-next-2.6
---

14934efab62201c176c620bd598b34b59acb6796