| commit | acbb67d51ef0ff942d592d44fb8abb4c931041ff | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Tue Oct 17 15:04:45 2006 -0700 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Tue Oct 17 15:04:45 2006 -0700 |
| tree | dcb18c0a192083632177b34610ed3457a68f4727 | |
| parent | 22a60f1951256ed493bf1430f8c3edcb31c0dbaa [diff] | |
| parent | 1f5c23e2c10d642a23aa3ebb449670a5184b6aab [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: Use mmiowb after doorbell ring IB/ipath: Initialize diagpkt file on device init only RDMA/amso1100: Fix a NULL dereference in error path RDMA/amso1100: pci_module_init() conversion