From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed, 19 Apr 2006 18:52:30 +0000 (-0700)
Subject: Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
X-Git-Tag: v3.12-rc1~36443
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=52824b6b5fa0533e2b2adc9df396d0e9ff6fb02a;p=kernel%2Fkernel-generic.git

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
---

52824b6b5fa0533e2b2adc9df396d0e9ff6fb02a