summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/button.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-01-12 23:46:55 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-01-12 23:46:55 +0100
commitbcc7201a91176f815f48f8ad889a20c5c829d9a9 (patch)
tree9716216a0e86a615a9565bd81f3b352145f2f209 /drivers/acpi/button.c
parentMerge branch 'acpi-dsm' (diff)
parentACPI / EC: disable GPE before removing GPE handler (diff)
parentACPI: Blacklist Win8 OSI for some HP laptop 2013 models (diff)
parentACPI / thermal: remove const from thermal_zone_device_ops declaration (diff)
parentACPI / scan: bail out early if failed to parse APIC ID for CPU (diff)
parentACPI / sleep: remove panic in case hardware has changed after S4 (diff)
downloadlinux-bcc7201a91176f815f48f8ad889a20c5c829d9a9.tar.xz
linux-bcc7201a91176f815f48f8ad889a20c5c829d9a9.zip
Merge branches 'acpi-gpe', 'acpi-video', 'acpi-thermal', 'acpi-processor', 'acpi-sleep'
* acpi-gpe: ACPI / EC: disable GPE before removing GPE handler ACPI / Button: Fix enabling button GPEs twice * acpi-video: ACPI: Blacklist Win8 OSI for some HP laptop 2013 models ACPI / video: Fix typo in video_detect.c * acpi-thermal: ACPI / thermal: remove const from thermal_zone_device_ops declaration * acpi-processor: ACPI / scan: bail out early if failed to parse APIC ID for CPU * acpi-sleep: ACPI / sleep: remove panic in case hardware has changed after S4