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: thinkpad-acpi: bump up version to 0.16 ACPI: thinkpad-acpi: revert new 2.6.23 CONFIG_THINKPAD_ACPI_INPUT_ENABLED option ACPI: fix CONFIG_NET=n acpi_bus_generate_netlink_event build failure msi-laptop: replace ',' with ';' ACPI: (more) delete CONFIG_ACPI_PROCFS_SLEEP (again)
Showing
- Documentation/thinkpad-acpi.txt 77 additions, 19 deletionsDocumentation/thinkpad-acpi.txt
- drivers/acpi/event.c 1 addition, 1 deletiondrivers/acpi/event.c
- drivers/acpi/sleep/proc.c 5 additions, 5 deletionsdrivers/acpi/sleep/proc.c
- drivers/misc/Kconfig 0 additions, 20 deletionsdrivers/misc/Kconfig
- drivers/misc/msi-laptop.c 1 addition, 1 deletiondrivers/misc/msi-laptop.c
- drivers/misc/thinkpad_acpi.c 87 additions, 57 deletionsdrivers/misc/thinkpad_acpi.c
- drivers/misc/thinkpad_acpi.h 1 addition, 0 deletionsdrivers/misc/thinkpad_acpi.h
Loading
Please register or sign in to comment