From: Linus Torvalds Date: Fri, 16 Sep 2005 17:31:31 +0000 (-0700) Subject: Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... X-Git-Tag: v2.6.14-rc2~5^2~65 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=6da34a8dc03c9605b03154eacfd2234627cc485a;p=linux-2.6-omap-h63xx.git Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev --- 6da34a8dc03c9605b03154eacfd2234627cc485a