summaryrefslogtreecommitdiffstats
path: root/include/acpi/container.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-11-30 11:06:40 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2008-11-30 11:06:40 -0800
commit95c5e1f1e6e1788cc8b9acbe9379ae395ef64958 (patch)
treef6b41406a9eb3c6219d715efe00de7f43c232703 /include/acpi/container.h
parentb31a0fecd1dd01f1db406014a7c8a73983e04cc9 (diff)
parent23d0a65cf229acd273b6f5a325c34d758a90d592 (diff)
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: toshiba_acpi: close race in toshiba_acpi driver ACPICA: disable _BIF warning ACPI: delete OSI(Linux) DMI dmesg spam ACPICA: Allow _WAK method to return an Integer ACPI: thinkpad-acpi: fix fan sleep/resume path sony-laptop: printk tweak sony-laptop: brightness regression fix Revert "ACPI: don't enable control method power button as wakeup device when Fixed Power button is used" ACPI suspend: Blacklist boxes that require us to set SCI_EN directly on resume ACPI: scheduling in atomic via acpi_evaluate_integer () ACPI: battery: Convert discharge energy rate to current properly ACPI: EC: count interrupts only if called from interrupt handler.
Diffstat (limited to 'include/acpi/container.h')
0 files changed, 0 insertions, 0 deletions