]> err.no Git - linux-2.6/commit
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 30 Jun 2006 22:39:49 +0000 (15:39 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 30 Jun 2006 22:39:49 +0000 (15:39 -0700)
commit93fdf10d4c28edaa1b9f80e7f9c3002359186d00
tree4c5700b7f647470dcbb3b2a0531529ba35531b3d
parent22a3e233ca08a2ddc949ba1ae8f6e16ec7ef1a13
parent0d8fdfd71bc871ffc07fe4429db8d4934185a8ec
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/core: Set alternate port number when initializing QP attributes
  IB/uverbs: Set correct user handle for user SRQs