tree 7f342be7e40638b00ab18c2eb1045fef6d072309
parent a12e60621b553e32711f9ad653aad3c92881c400
parent 3d758a4a48682639d3996968499913ecb1552e06
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1197913931 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1197913931 -0800

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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