summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/device_pm.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-12-18 18:42:56 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-12-18 18:42:56 +0100
commitbe10f60d29433f712bf0887431efb80975e64438 (patch)
tree76e1c30e5702babb16d3dc7b1e49c47a21e9e0c0 /drivers/acpi/device_pm.c
parentMerge branch 'fixes' (diff)
parentACPI / scan: Change the level of _DEP-related messages to KERN_DEBUG (diff)
parentACPI / utils: Drop error messages from acpi_evaluate_reference() (diff)
parentACPI / PM: Do not disable wakeup GPEs that have not been enabled (diff)
downloadlinux-be10f60d29433f712bf0887431efb80975e64438.tar.xz
linux-be10f60d29433f712bf0887431efb80975e64438.zip
Merge branches 'acpi-scan', 'acpi-utils' and 'acpi-pm'
* acpi-scan: ACPI / scan: Change the level of _DEP-related messages to KERN_DEBUG * acpi-utils: ACPI / utils: Drop error messages from acpi_evaluate_reference() * acpi-pm: ACPI / PM: Do not disable wakeup GPEs that have not been enabled