diff options
| author |   Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-10 15:37:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-10 15:37:47 -0700 |
| commit | 0e44dc383787b472a7f13564c6bd8a44cc07d408 (patch) | |
| tree | e7d49fa04f93dec589c1fa8ffb1b129b1b92a0f9 /include/linux | |
| parent | Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/shemminger/netdev-2.6 (diff) | |
| parent | IB/mthca: FMR ioremap fix (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
Diffstat (limited to 'include/linux')
0 files changed, 0 insertions, 0 deletions