Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 17 Apr 2007 23:50:59 +0000 (16:50 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 17 Apr 2007 23:50:59 +0000 (16:50 -0700)
commit245d95a423664761d9399656098523db6988e9cc
tree88f9484b25a0806c899fa84cfbbff334881701f4
parent71bfa15142177279ec63c0e400314bb81f3d7122
parent608d8268be392444f825b4fc8fc7c8b509627129
Merge branch 'for-linus' of /linux/kernel/git/roland/infiniband

* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband:
  IB/mthca: Fix data corruption after FMR unmap on Sinai