From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed, 10 May 2006 22:37:47 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland... 
X-Git-Tag: v2.6.17-rc4~7
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=0e44dc383787b472a7f13564c6bd8a44cc07d408;p=safe%2Fjmp%2Flinux-2.6

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: FMR ioremap fix
  IPoIB: Free child interfaces properly
  IB/mthca: Fix race in reference counting
  IB/srp: Fix tracking of pending requests during error handling
  IB: Fix display of 4-bit port counters in sysfs
---

0e44dc383787b472a7f13564c6bd8a44cc07d408