From: Linus Torvalds Date: Fri, 30 Jun 2006 22:39:49 +0000 (-0700) Subject: Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband X-Git-Tag: MMI-PSA29.97-13-9~48623 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=93fdf10d4c28edaa1b9f80e7f9c3002359186d00;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Merge branch 'for-linus' of /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 --- 93fdf10d4c28edaa1b9f80e7f9c3002359186d00