From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Sun, 27 Jul 2014 21:55:19 +0000 (+0200)
Subject: Merge branches 'acpi-pm', 'acpi-sleep' and 'acpi-button'
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=805c52815825b1ed2e3249508ce5ffa5aeae5d1d;p=deliverable%2Flinux.git

Merge branches 'acpi-pm', 'acpi-sleep' and 'acpi-button'

* acpi-pm:
  ACPI / PM: Use ACPI_COMPANION() instead of ACPI_HANDLE()
  ACPI / PM: Always enable wakeup GPEs when enabling device wakeup
  ACPI / PM: Revork the handling of ACPI device wakeup notifications
  PM: Create PM workqueue if runtime PM is not configured too

* acpi-sleep:
  ACPI / sleep: Do not save NVS for new machines to accelerate S3

* acpi-button:
  ACPI / button: Do not propagate wakeup-from-suspend events
---

805c52815825b1ed2e3249508ce5ffa5aeae5d1d