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 / PM: Do not save/restore NVS on Sony Vaio VGN-NW130D ACPI/HEST: adjust section selection ACPI: eliminate unused variable warning for !ACPI_SLEEP ACPI/PNP: avoid section mismatch warning ACPI thermal: remove two unused functions ACPI: fix a section mismatch ACPI, APEI, use raw spinlock in ERST ACPI: video: fix build for CONFIG_ACPI=n ACPI: video: fix build for VIDEO_OUTPUT_CONTROL=n ACPI: fix allowing to add/remove multiple _OSI strings acpi: fix _OSI string setup regression ACPI: EC: Add another dmi match entry for MSI hardware ACPI battery: update status upon sysfs query ACPI ac: update AC status upon sysfs query ACPI / PM: Do not refcount power resources that can't be turned on ACPI / PM: Check device state before refcounting power resources
Showing
- drivers/acpi/ac.c 29 additions, 17 deletionsdrivers/acpi/ac.c
- drivers/acpi/apei/erst.c 17 additions, 17 deletionsdrivers/acpi/apei/erst.c
- drivers/acpi/apei/hest.c 5 additions, 5 deletionsdrivers/acpi/apei/hest.c
- drivers/acpi/battery.c 5 additions, 0 deletionsdrivers/acpi/battery.c
- drivers/acpi/ec.c 3 additions, 0 deletionsdrivers/acpi/ec.c
- drivers/acpi/osl.c 77 additions, 36 deletionsdrivers/acpi/osl.c
- drivers/acpi/power.c 6 additions, 6 deletionsdrivers/acpi/power.c
- drivers/acpi/processor_thermal.c 0 additions, 9 deletionsdrivers/acpi/processor_thermal.c
- drivers/acpi/sleep.c 10 additions, 2 deletionsdrivers/acpi/sleep.c
- drivers/pnp/pnpacpi/core.c 1 addition, 1 deletiondrivers/pnp/pnpacpi/core.c
- include/acpi/video.h 4 additions, 1 deletioninclude/acpi/video.h
- include/linux/acpi.h 1 addition, 1 deletioninclude/linux/acpi.h
- include/linux/video_output.h 15 additions, 0 deletionsinclude/linux/video_output.h
Loading
Please register or sign in to comment