From: Linus Torvalds Date: Sun, 28 May 2006 23:35:52 +0000 (-0700) Subject: Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... X-Git-Tag: v2.6.17-rc6~93 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9ec5ad24ce80b7ef69a0717363db661d13aada5;p=linux-2.6 Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: [PATCH] the latest consensus libata resume fix --- d9ec5ad24ce80b7ef69a0717363db661d13aada5