Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 23 Jan 2007 19:13:06 +0000 (11:13 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 23 Jan 2007 19:13:06 +0000 (11:13 -0800)
commit821836e5baa69b8bc80605f25ad963e721609bc0
tree0d09c66706e2abdb460c4ab32133b1a49ad7a304
parent73f66ace34e3d935d1ad01208234f8871ac1f500
parentcea9ea67e9927da18af89b49bd949a8d65ba1b15
Merge branch 'for-linus' of /linux/kernel/git/roland/infiniband

* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband:
  IB/ehca: Fix mismatched spin_unlock in irq handler
  IB/ehca: Fix improper use of yield() with spinlock held
  IB/srp: Check match_strdup() return