From: David S. Miller <davem@davemloft.net>
Date: Tue, 12 Oct 2010 18:43:42 +0000 (-0700)
Subject: Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/net-next-2.6
X-Git-Tag: v2.6.37-rc1~147^2~161
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=8fa6e3d4549271a5b4094893f059bb95f99a8fde;p=~emulex%2Finfiniband.git

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

8fa6e3d4549271a5b4094893f059bb95f99a8fde