From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 23 Jan 2007 19:13:06 +0000 (-0800)
Subject: Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
X-Git-Tag: v2.6.20-rc6~18
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=821836e5baa69b8bc80605f25ad963e721609bc0;p=linux-2.6-omap-h63xx.git

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/ehca: Fix mismatched spin_unlock in irq handler
  IB/ehca: Fix improper use of yield() with spinlock held
  IB/srp: Check match_strdup() return
---

821836e5baa69b8bc80605f25ad963e721609bc0