From: Linus Torvalds Date: Sat, 24 Dec 2005 20:40:43 +0000 (-0800) Subject: Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... X-Git-Tag: v2.6.15-rc7~2 X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=cdcdb28623fb74d9564b102cd1cbe3854071e855;p=linux-2.6-omap-h63xx.git Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev --- cdcdb28623fb74d9564b102cd1cbe3854071e855