tree 86b588fcd75715ed578f92c0abb3149d6cf617b5
parent 949b211235cf301790ef4fb903af65d71be29b2a
parent 415dcd95b25b59631656f559570d1a973bf691a9
author Linus Torvalds <torvalds@g5.osdl.org> 1145472750 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1145472750 -0700

Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband:
  IB/mthca: make a function static
  IB/ipath: Fix whitespace
  IB/ipath: Make more names static
  IB/mad: Fix RMPP version check during agent registration
  IB/srp: Remove request from list when SCSI abort succeeds