From: David S. Miller <davem@davemloft.net>
Date: Wed, 8 Dec 2010 18:01:00 +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~476^2~294
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=a2d4b65d477aad1fe8c7218781a031fa9cf5abfc;p=~emulex%2Finfiniband.git

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

a2d4b65d477aad1fe8c7218781a031fa9cf5abfc