From: Linus Torvalds Date: Tue, 13 Dec 2005 16:53:56 +0000 (-0800) Subject: Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... X-Git-Tag: v2.6.16.28-rc1~1226^2~98 X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=90ac8f7741be4ff66de1f52904f4f67f272f74ce;hp=-c Merge branch 'upstream-fixes' of /linux/kernel/git/jgarzik/libata-dev --- 90ac8f7741be4ff66de1f52904f4f67f272f74ce