From: Linus Torvalds Date: Fri, 23 Sep 2005 23:44:52 +0000 (-0700) Subject: Merge branch 'upstream' from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... X-Git-Tag: v2.6.14-rc3~51^2~5 X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=87e807b6c461bbd449496a4c3ab78ab164a4ba97;p=linux-2.6-omap-h63xx.git Merge branch 'upstream' from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev --- 87e807b6c461bbd449496a4c3ab78ab164a4ba97