From: Linus Torvalds Date: Tue, 27 Jan 2009 15:50:41 +0000 (-0800) Subject: Merge branch 'hibern_fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik... X-Git-Tag: v2.6.29-rc3~12 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=490a8d70cdd77d6262c3d5815bc0b1c54a3a63f8;p=linux-2.6-omap-h63xx.git Merge branch 'hibern_fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'hibern_fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: SATA PIIX: Blacklist system that spins off disks during ACPI power off SATA Sil: Blacklist system that spins off disks during ACPI power off SATA AHCI: Blacklist system that spins off disks during ACPI power off SATA: Blacklisting of systems that spin off disks during ACPI power off DMI: Introduce dmi_first_match to make the interface more flexible Hibernation: Introduce system_entering_hibernation --- 490a8d70cdd77d6262c3d5815bc0b1c54a3a63f8