tree 55ea6a59166d1690346304f6c0fb7e6d52cdbe6c
parent e4b42be77ecc663550b515fcb7761b01fac0f272
parent 78e1ca49c7ead5cd00882ed0c776260857613122
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1190822188 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1190822188 -0700

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: hpet: ACPI Error (utglobal-0126): Unknown exception code: 0xFFFFFFF0
  ACPI: CONFIG_ACPI_SLEEP=n power off regression in 2.6.23-rc8 (NOT in rc7)
  ACPI: suspend: build-fix for CONFIG_SUSPEND=n and CONFIG_HIBERNATION=y