From: Linus Torvalds Date: Sat, 5 Nov 2005 00:32:36 +0000 (-0800) Subject: Merge branch 'srp' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband X-Git-Tag: v2.6.15-rc1~726^2~1 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=127f2fa31ac624c744f3767363c4919209980956;p=linux-2.6-omap-h63xx.git Merge branch 'srp' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband --- 127f2fa31ac624c744f3767363c4919209980956