Commit 52cfd503ad7176d23a5dd7af3981744feb60622f
Exists in
master
and in
4 other branches
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: (59 commits) ACPI / PM: Fix build problems for !CONFIG_ACPI related to NVS rework ACPI: fix resource check message ACPI / Battery: Update information on info notification and resume ACPI: Drop device flag wake_capable ACPI: Always check if _PRW is present before trying to evaluate it ACPI / PM: Check status of power resources under mutexes ACPI / PM: Rename acpi_power_off_device() ACPI / PM: Drop acpi_power_nocheck ACPI / PM: Drop acpi_bus_get_power() Platform / x86: Make fujitsu_laptop use acpi_bus_update_power() ACPI / Fan: Rework the handling of power resources ACPI / PM: Register power resource devices as soon as they are needed ACPI / PM: Register acpi_power_driver early ACPI / PM: Add function for updating device power state consistently ACPI / PM: Add function for device power state initialization ACPI / PM: Introduce __acpi_bus_get_power() ACPI / PM: Introduce function for refcounting device power resources ACPI / PM: Add functions for manipulating lists of power resources ACPI / PM: Prevent acpi_power_get_inferred_state() from making changes ACPICA: Update version to 20101209 ...
Warning! This is a large diff.
To preserve performance the diff is not shown. Please, download the diff as plain diff or email patch instead.
If you still want to see the diff click this link
Showing 85 changed files Side-by-side Diff
- Documentation/ABI/stable/thermal-notification
- Documentation/IPMI.txt
- Documentation/acpi/apei/output_format.txt
- Documentation/feature-removal-schedule.txt
- Documentation/kernel-parameters.txt
- Documentation/thermal/sysfs-api.txt
- arch/ia64/include/asm/io.h
- arch/x86/kernel/acpi/boot.c
- arch/x86/kernel/dumpstack.c
- arch/x86/kernel/e820.c
- drivers/acpi/Kconfig
- drivers/acpi/Makefile
- drivers/acpi/ac.c
- drivers/acpi/acpi_ipmi.c
- drivers/acpi/acpica/Makefile
- drivers/acpi/acpica/acevents.h
- drivers/acpi/acpica/acglobal.h
- drivers/acpi/acpica/achware.h
- drivers/acpi/acpica/aclocal.h
- drivers/acpi/acpica/evevent.c
- drivers/acpi/acpica/evgpe.c
- drivers/acpi/acpica/evgpeblk.c
- drivers/acpi/acpica/evgpeinit.c
- drivers/acpi/acpica/evgpeutil.c
- drivers/acpi/acpica/evmisc.c
- drivers/acpi/acpica/evxface.c
- drivers/acpi/acpica/evxfevnt.c
- drivers/acpi/acpica/evxfgpe.c
- drivers/acpi/acpica/hwgpe.c
- drivers/acpi/acpica/utglobal.c
- drivers/acpi/apei/apei-internal.h
- drivers/acpi/apei/cper.c
- drivers/acpi/apei/ghes.c
- drivers/acpi/battery.c
- drivers/acpi/bus.c
- drivers/acpi/button.c
- drivers/acpi/dock.c
- drivers/acpi/ec.c
- drivers/acpi/fan.c
- drivers/acpi/glue.c
- drivers/acpi/internal.h
- drivers/acpi/nvs.c
- drivers/acpi/osl.c
- drivers/acpi/power.c
- drivers/acpi/proc.c
- drivers/acpi/processor_driver.c
- drivers/acpi/processor_throttling.c
- drivers/acpi/sbs.c
- drivers/acpi/scan.c
- drivers/acpi/sleep.c
- drivers/acpi/sysfs.c
- drivers/acpi/thermal.c
- drivers/acpi/video.c
- drivers/acpi/video_detect.c
- drivers/acpi/wakeup.c
- drivers/char/ipmi/ipmi_msghandler.c
- drivers/char/ipmi/ipmi_si_intf.c
- drivers/gpu/drm/Kconfig
- drivers/gpu/stub/Kconfig
- drivers/platform/x86/fujitsu-laptop.c
- drivers/pnp/Makefile
- drivers/pnp/core.c
- drivers/pnp/driver.c
- drivers/pnp/isapnp/Makefile
- drivers/pnp/pnpacpi/Makefile
- drivers/pnp/pnpacpi/core.c
- drivers/pnp/pnpbios/Makefile
- drivers/thermal/Kconfig
- drivers/thermal/thermal_sys.c
- include/acpi/acpi_bus.h
- include/acpi/acpixf.h
- include/acpi/actypes.h
- include/acpi/processor.h
- include/linux/acpi.h
- include/linux/cper.h
- include/linux/ipmi.h
- include/linux/ipmi_smi.h
- include/linux/suspend.h
- include/linux/thermal.h
- kernel/panic.c
- kernel/power/Kconfig
- kernel/power/Makefile
- kernel/power/nvs.c
- lib/ioremap.c
- mm/vmalloc.c