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

Browse source

* '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

...

This commit is contained in:

Linus Torvalds 2007-09-26 08:56:28 -07:00

parent e4b42be77e 78e1ca49c7

commit 1f23f4209f

4 changed files with 29 additions and 29 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

drivers/acpi/sleep/Makefile

View file

46

drivers/acpi/sleep/main.c

View file

6

drivers/char/hpet.c

View file

4

include/acpi/acpi_drivers.h

View file