From: Linus Torvalds Date: Tue, 15 Nov 2005 20:45:33 +0000 (-0800) Subject: Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... X-Git-Tag: v2.6.15-rc2~79 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=7ae8c5ec122e4e909193dbbdb2ad2de349e307c9;p=~emulex%2Finfiniband.git Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev --- 7ae8c5ec122e4e909193dbbdb2ad2de349e307c9