From: Linus Torvalds Date: Thu, 5 Jan 2006 00:32:33 +0000 (-0800) Subject: Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev X-Git-Tag: v2.6.16-rc1~474^2~22^2~6 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1cb9e8e01d2c73184e2074f37cd155b3c4fdaae6;p=linux-2.6 Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev --- 1cb9e8e01d2c73184e2074f37cd155b3c4fdaae6