diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-27 10:38:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-27 10:38:48 -0700 |
| commit | 73964f6bc8e378715887592abe8a512f403db6a8 (patch) | |
| tree | c4aaab48d36ed06243542518ff644c654bdaf586 /include | |
| parent | 9d98ece16f1a1df0f456a2ee9429d03e82e839a2 (diff) | |
| parent | e56d953d190061938b31cabbe01b7f3d76c60bd0 (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:
ACPI: IA64=y ACPI=n build fix
ACPI: Kill overly verbose "power state" log messages
ACPI: fix Compaq Evo N800c (Pentium 4m) boot hang regression
ACPI: Clarify resource conflict message
thinkpad-acpi: fix CONFIG_THINKPAD_ACPI_HOTKEY_POLL build problem
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions