From: Linus Torvalds Date: Tue, 13 Dec 2005 05:41:58 +0000 (-0800) Subject: Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... X-Git-Tag: v2.6.15-rc6~95 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=b11d0e48aa41b644143ca526ef8d69212fdc1cdd;p=linux-2.6-omap-h63xx.git Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev --- b11d0e48aa41b644143ca526ef8d69212fdc1cdd