Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 17 Oct 2006 22:04:45 +0000 (15:04 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 17 Oct 2006 22:04:45 +0000 (15:04 -0700)
commitacbb67d51ef0ff942d592d44fb8abb4c931041ff
treedcb18c0a192083632177b34610ed3457a68f4727
parent22a60f1951256ed493bf1430f8c3edcb31c0dbaa
parent1f5c23e2c10d642a23aa3ebb449670a5184b6aab
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: 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