Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 19 Apr 2006 18:52:30 +0000 (11:52 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 19 Apr 2006 18:52:30 +0000 (11:52 -0700)
commit52824b6b5fa0533e2b2adc9df396d0e9ff6fb02a
tree86b588fcd75715ed578f92c0abb3149d6cf617b5
parent949b211235cf301790ef4fb903af65d71be29b2a
parent415dcd95b25b59631656f559570d1a973bf691a9
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: 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