From: Linus Torvalds Date: Mon, 9 Jan 2006 17:39:55 +0000 (-0800) Subject: Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... X-Git-Tag: v2.6.16-rc1~668 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b78e83bfbc12f7e9bdefd400abdfde9e6c9ac51;p=linux-2.6 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev --- 8b78e83bfbc12f7e9bdefd400abdfde9e6c9ac51