Merge branch 'hibern_fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 27 Jan 2009 15:50:41 +0000 (07:50 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 27 Jan 2009 15:50:41 +0000 (07:50 -0800)
commit490a8d70cdd77d6262c3d5815bc0b1c54a3a63f8
treecf8feb25b7ce349b375a6bdfab8d4d83b3fc9715
parent8c022fdd5fc1b9949bad21d26e0cb115d045c7f9
parent5f451fe1ab5d73b987051f0d23c85216c552e163
Merge branch 'hibern_fixes' of git://git./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