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: (179 commits) ACPI: Fix acpi_processor_idle and idle= boot parameters interaction acpi: fix section mismatch warning in pnpacpi intel_menlo: fix build warning ACPI: Cleanup: Remove unneeded, multiple local dummy variables ACPI: video - fix permissions on some proc entries ACPI: video - properly handle errors when registering proc elements ACPI: video - do not store invalid entries in attached_array list ACPI: re-name acpi_pm_ops to acpi_suspend_ops ACER_WMI/ASUS_LAPTOP: fix build bug thinkpad_acpi: fix possible NULL pointer dereference if kstrdup failed ACPI: check a return value correctly in acpi_power_get_context() #if 0 acpi/bay.c:eject_removable_drive() eeepc-laptop: add hwmon fan control eeepc-laptop: add backlight eeepc-laptop: add base driver ACPI: thinkpad-acpi: bump up version to 0.20 ACPI: thinkpad-acpi: fix selects in Kconfig ACPI: thinkpad-acpi: use a private workqueue ACPI: thinkpad-acpi: fluff really minor fix ACPI: thinkpad-acpi: use uppercase for "LED" on user documentation ... Fixed conflicts in drivers/acpi/video.c and drivers/misc/intel_menlow.c manually.
No related branches found
No related tags found
Showing
- Documentation/laptops/thinkpad-acpi.txt 122 additions, 17 deletionsDocumentation/laptops/thinkpad-acpi.txt
- Documentation/thermal/sysfs-api.txt 27 additions, 6 deletionsDocumentation/thermal/sysfs-api.txt
- MAINTAINERS 7 additions, 0 deletionsMAINTAINERS
- arch/frv/kernel/pm.c 0 additions, 8 deletionsarch/frv/kernel/pm.c
- arch/mips/au1000/common/power.c 1 addition, 34 deletionsarch/mips/au1000/common/power.c
- arch/x86/kernel/apm_32.c 0 additions, 16 deletionsarch/x86/kernel/apm_32.c
- drivers/acpi/Kconfig 3 additions, 0 deletionsdrivers/acpi/Kconfig
- drivers/acpi/bay.c 2 additions, 0 deletionsdrivers/acpi/bay.c
- drivers/acpi/dispatcher/dsfield.c 100 additions, 73 deletionsdrivers/acpi/dispatcher/dsfield.c
- drivers/acpi/dispatcher/dsinit.c 1 addition, 1 deletiondrivers/acpi/dispatcher/dsinit.c
- drivers/acpi/dispatcher/dsmethod.c 23 additions, 34 deletionsdrivers/acpi/dispatcher/dsmethod.c
- drivers/acpi/dispatcher/dsmthdat.c 1 addition, 1 deletiondrivers/acpi/dispatcher/dsmthdat.c
- drivers/acpi/dispatcher/dsobject.c 78 additions, 23 deletionsdrivers/acpi/dispatcher/dsobject.c
- drivers/acpi/dispatcher/dsopcode.c 256 additions, 4 deletionsdrivers/acpi/dispatcher/dsopcode.c
- drivers/acpi/dispatcher/dsutils.c 149 additions, 18 deletionsdrivers/acpi/dispatcher/dsutils.c
- drivers/acpi/dispatcher/dswexec.c 34 additions, 44 deletionsdrivers/acpi/dispatcher/dswexec.c
- drivers/acpi/dispatcher/dswload.c 27 additions, 10 deletionsdrivers/acpi/dispatcher/dswload.c
- drivers/acpi/dispatcher/dswscope.c 1 addition, 1 deletiondrivers/acpi/dispatcher/dswscope.c
- drivers/acpi/dispatcher/dswstate.c 113 additions, 404 deletionsdrivers/acpi/dispatcher/dswstate.c
- drivers/acpi/ec.c 124 additions, 116 deletionsdrivers/acpi/ec.c
Loading
Please register or sign in to comment