Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 11 Apr 2007 00:23:52 +0000 (17:23 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 11 Apr 2007 00:23:52 +0000 (17:23 -0700)
commit6b07bb878e87c96b4b6f2a6768ed3c09518a6467
tree73b06c82859b4a36ab31082e7dfa7fab6e42dc64
parent52684635ccaeb7ad223a77851c50da92a718ace9
parente87d78e2e69c5127e5278e0484686a48a2c4481c
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
  IPoIB/cm: Fix DMA direction typo
  IB/iser: Don't defer connection failure notification to workqueue