Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
commitda8bacf6d59288ef3e41389db24886c928dcbd33
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 24 May 2006 15:55:12 +0000 (24 08:55 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 24 May 2006 15:55:12 +0000 (24 08:55 -0700)
tree35d2739fb57a760dca1c9413a6814d6d2be8e295
parent67e3812426efbe62dd765eed9895cd3098def948
parent09b74de9fff056a0a4058a0f14508acba89ea6fc
Merge branch 'for-linus' of /linux/kernel/git/roland/infiniband

* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband:
  IB/ipath: deref correct pointer when using kernel SMA
  IB/ipath: fix null deref during rdma ops
  IB/ipath: register as IB device owner
  IB/ipath: enable PE800 receive interrupts on user ports
  IB/ipath: enable GPIO interrupt on HT-460
  IB/ipath: fix NULL dereference during cleanup
  IB/ipath: replace uses of LIST_POISON
  IB/ipath: fix reporting of driver version to userspace
  IB/ipath: don't modify QP if changes fail
  IB/ipath: fix spinlock recursion bug