Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 17 Dec 2007 17:52:11 +0000 (09:52 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 17 Dec 2007 17:52:11 +0000 (09:52 -0800)
commitac0b50dd10ac0d30f2732eec0587f3632c2be725
tree7f342be7e40638b00ab18c2eb1045fef6d072309
parenta12e60621b553e32711f9ad653aad3c92881c400
parent3d758a4a48682639d3996968499913ecb1552e06
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