commit cd5e25d93e6efeb93db7b6731b0a674495270621
author Linus Torvalds <torvalds@g5.osdl.org> Sun Apr 02 12:51:22 2006 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Sun Apr 02 12:51:22 2006 -0700
tree 82b38420e37cf3cc71ddbd85b53e874a1f0c2299
parent 86dca4f8e6ab1fd8a3fb5838163fc9d7990f416e
parent 77d8798b554c856e21400bc8e761bc1b2ded8967

Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband:
  IB/ipath: kbuild infrastructure
  IB/ipath: infiniband verbs support
  IB/ipath: misc infiniband code, part 2
  IB/ipath: misc infiniband code, part 1
  IB/ipath: infiniband RC protocol support
  IB/ipath: infiniband UC and UD protocol support
  IB/ipath: infiniband header files
  IB/ipath: layering interfaces used by higher-level driver code
  IB/ipath: support for userspace apps using core driver
  IB/ipath: sysfs and ipathfs support for core driver
  IB/ipath: misc driver support code
  IB/ipath: chip initialisation code, and diag support
  IB/ipath: support for PCI Express devices
  IB/ipath: support for HyperTransport devices
  IB/ipath: core driver header files
  IB/ipath: core device driver