tree e7510b0f2300e059db3fbe850b68667af28531f0
parent 09f3eca2b7e2762e223fdd359f9d0f6303a85f6c
parent 982286d1b8e438f595cdc9304cc4c185c7b90a39
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1196979256 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1196979256 -0800

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
  ACPI: suspend: old debugging hacks sneaked back
  Freezer: Fix JFFS2 garbage collector freezing issue (rev. 2)
  HWMON: coretemp, suspend fix
  Freezer: Fix APM emulation breakage
  Freezer: Fix s2disk resume from initrd