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: (23 commits) ACPI PCI hotplug: harden against panic regression ACPI: rename main.c to sleep.c dell-laptop: move to drivers/platform/x86/ from drivers/misc/ eeepc-laptop: enable Bluetooth ACPI details ACPI: fix ACPI_FADT_S4_RTC_WAKE comment kprobes: check CONFIG_FREEZER instead of CONFIG_PM PM: Fix freezer compilation if PM_SLEEP is unset thermal fixup for broken BIOS which has invalid trip points. ACPI: EC: Don't trust ECDT tables from ASUS ACPI: EC: Limit workaround for ASUS notebooks even more ACPI: thinkpad-acpi: bump up version to 0.22 ACPI: thinkpad-acpi: handle HKEY event 6030 ACPI: thinkpad-acpi: clean-up fan subdriver quirk ACPI: thinkpad-acpi: start the event hunt season ACPI: thinkpad-acpi: handle HKEY thermal and battery alarms ACPI: thinkpad-acpi: clean up hotkey_notify() ACPI: thinkpad-acpi: use killable instead of interruptible mutexes ACPI: thinkpad-acpi: add UWB radio support ACPI: thinkpad-acpi: preserve radio state across shutdown ACPI: thinkpad-acpi: resume with radios disabled ...
Showing
- Documentation/laptops/thinkpad-acpi.txt 22 additions, 3 deletionsDocumentation/laptops/thinkpad-acpi.txt
- arch/ia64/kernel/kprobes.c 1 addition, 1 deletionarch/ia64/kernel/kprobes.c
- arch/x86/kernel/kprobes.c 1 addition, 1 deletionarch/x86/kernel/kprobes.c
- drivers/acpi/Makefile 1 addition, 1 deletiondrivers/acpi/Makefile
- drivers/acpi/ec.c 30 additions, 43 deletionsdrivers/acpi/ec.c
- drivers/acpi/sleep.c 0 additions, 0 deletionsdrivers/acpi/sleep.c
- drivers/acpi/thermal.c 12 additions, 4 deletionsdrivers/acpi/thermal.c
- drivers/misc/Makefile 0 additions, 1 deletiondrivers/misc/Makefile
- drivers/pci/hotplug/acpiphp_glue.c 2 additions, 0 deletionsdrivers/pci/hotplug/acpiphp_glue.c
- drivers/platform/x86/Kconfig 23 additions, 0 deletionsdrivers/platform/x86/Kconfig
- drivers/platform/x86/Makefile 1 addition, 0 deletionsdrivers/platform/x86/Makefile
- drivers/platform/x86/dell-laptop.c 1 addition, 1 deletiondrivers/platform/x86/dell-laptop.c
- drivers/platform/x86/eeepc-laptop.c 2 additions, 2 deletionsdrivers/platform/x86/eeepc-laptop.c
- drivers/platform/x86/thinkpad_acpi.c 758 additions, 152 deletionsdrivers/platform/x86/thinkpad_acpi.c
- include/acpi/actbl.h 1 addition, 1 deletioninclude/acpi/actbl.h
- kernel/kprobes.c 1 addition, 1 deletionkernel/kprobes.c
- kernel/power/Makefile 2 additions, 1 deletionkernel/power/Makefile
Loading
Please register or sign in to comment