From: Linus Torvalds Date: Fri, 17 Feb 2006 21:47:16 +0000 (-0800) Subject: Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... X-Git-Tag: v2.6.16-rc4~20 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=614f8f50ca1361d054cdeca38d241684490d2296;p=~shefty%2Frdma-dev.git Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev --- 614f8f50ca1361d054cdeca38d241684490d2296