From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 23 Oct 2014 21:02:58 +0000 (+0200)
Subject: Merge branches 'acpi-pm' and 'pm-genirq'
X-Git-Tag: v3.18-rc2~10^2~1
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=49fe0353689901b937ff21047a14d315bbbf78f3;p=users%2Fhch%2Fuuid.git

Merge branches 'acpi-pm' and 'pm-genirq'

* acpi-pm:
  ACPI: invoke acpi_device_wakeup() with correct parameters

* pm-genirq:
  PCI / PM: handle failure to enable wakeup on PCIe PME
---

49fe0353689901b937ff21047a14d315bbbf78f3