Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 19 Feb 2008 23:50:11 +0000 (15:50 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 19 Feb 2008 23:50:11 +0000 (15:50 -0800)
commite855e5d82edd708bcb966cf7ccda2dee1c154935
treea0efdf7a61329b2bae35e0ee61a94afe5f1eeeb2
parent37c514e3dfc8f55145d9c6895e2838ac31859aa4
parentb7f9c112a5e7f68d77a31c79f5942a3272ae9a3b
Merge branch 'for-linus' of git://git./linux/kernel/git/roland/infiniband

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
  IB/mthca: Free correct MPT on error exit from mthca_fmr_alloc()
  IPoIB/cm: Fix ipoib_cm_dev_stop() cleanup when drain times out