From: David S. Miller <davem@davemloft.net>
Date: Fri, 10 Dec 2010 19:22:57 +0000 (-0800)
Subject: Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/net-next-2.6
X-Git-Tag: Ubuntu-goldfish-3.4.0-4.27~4914^2~274
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=eaa7dcde1d092c792cbca4be81d2e506e84c6122;p=mirror_ubuntu-zesty-kernel.git

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

eaa7dcde1d092c792cbca4be81d2e506e84c6122