From: Linus Torvalds Date: Fri, 11 Nov 2005 17:25:54 +0000 (-0800) Subject: Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... X-Git-Tag: v2.6.15-rc1~11 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5eebf428ac91ad12d316a391b734670d61480d8;p=linux-2.6 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev --- d5eebf428ac91ad12d316a391b734670d61480d8