From: Linus Torvalds Date: Thu, 17 Nov 2005 16:43:38 +0000 (-0800) Subject: Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... X-Git-Tag: v2.6.15-rc2~69 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=fbf0e1348ec4023675123d432ce1fdfa1eef8e54;p=~emulex%2Finfiniband.git Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev --- fbf0e1348ec4023675123d432ce1fdfa1eef8e54