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
Showing
- arch/ia64/include/asm/acpi.h 2 additions, 0 deletionsarch/ia64/include/asm/acpi.h
- arch/x86/kernel/acpi/cstate.c 1 addition, 1 deletionarch/x86/kernel/acpi/cstate.c
- drivers/acpi/osl.c 7 additions, 1 deletiondrivers/acpi/osl.c
- drivers/acpi/processor_idle.c 0 additions, 7 deletionsdrivers/acpi/processor_idle.c
- drivers/platform/x86/thinkpad_acpi.c 2 additions, 0 deletionsdrivers/platform/x86/thinkpad_acpi.c
Loading
Please register or sign in to comment