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: v3.12-rc1~7141^2~246
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=14934efab62201c176c620bd598b34b59acb6796;p=kernel%2Fkernel-generic.git

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

14934efab62201c176c620bd598b34b59acb6796