Merge branches 'acpi-scan', 'acpi-utils' and 'acpi-pm'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 18 Dec 2014 17:42:56 +0000 (18:42 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 18 Dec 2014 17:42:56 +0000 (18:42 +0100)
commitbe10f60d29433f712bf0887431efb80975e64438
tree76e1c30e5702babb16d3dc7b1e49c47a21e9e0c0
parentae5056e8573c99c51acc4d77b287118ac015b4c1
parent80167a24a27449c06fbbfb1b0f4a5b965c41b428
parentc48cf1b9dd8f01358e5385d40fb58061f32313a7
parent175f8e2650f7ca6b33d338be3ccc1c00e89594ea
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
drivers/acpi/device_pm.c
drivers/acpi/scan.c
drivers/acpi/utils.c
include/acpi/acpi_bus.h