From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Mon, 17 Dec 2007 17:52:11 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=ac0b50dd10ac0d30f2732eec0587f3632c2be725;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'for-linus' of git://git./linux/kernel/git/roland/infiniband

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
  IB/ehca: Fix lock flag variable location, bump version number
  IB/ehca: Serialize HCA-related hCalls if necessary
  IB/ehca: Return correct number of SGEs for SRQ
---

ac0b50dd10ac0d30f2732eec0587f3632c2be725