| commit | 0e44dc383787b472a7f13564c6bd8a44cc07d408 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Wed May 10 15:37:47 2006 -0700 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Wed May 10 15:37:47 2006 -0700 |
| tree | e7d49fa04f93dec589c1fa8ffb1b129b1b92a0f9 | |
| parent | 6314410dd1e9db1c0009b0f7b56cc771a4d1e85a [diff] | |
| parent | ce477ae4f8c75c94587c3157deffad8219db09a0 [diff] |
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: 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