summaryrefslogtreecommitdiff
path: root/drivers/acpi/sleep.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/sleep.c
parentfbb9c10d40f88011ac72f855c97e3bdd981026a9 (diff)
parent42b946bb35ef0057f13887dec5f081df0ba8840a (diff)
parent2d4054d8422462cb2771fdb4eb1925df55d2b320 (diff)
parentec9c9c2ec1d164f3c5f3c9ac41f43de40040e43c (diff)
parentb981513f806d26b2cc971eb65ced14bede67558b (diff)
parent5c551e624abba6782034edd5b9eb58ac6f146b38 (diff)
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