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: Ubuntu-5.0.0-8.9~48931 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=d9ec5ad24ce80b7ef69a0717363db661d13aada5;p=mirror_ubuntu-disco-kernel.git 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