From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Tue, 17 Oct 2006 22:04:45 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland... 
X-Git-Tag: MMI-PSA29.97-13-9~45515^2~47^2~105
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=acbb67d51ef0ff942d592d44fb8abb4c931041ff;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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
---

acbb67d51ef0ff942d592d44fb8abb4c931041ff