diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-10-23 21:02:58 (GMT) |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-10-23 21:02:58 (GMT) |
| commit | 49fe0353689901b937ff21047a14d315bbbf78f3 (patch) | |
| tree | f5a3987c85aee7edfced76174b85dbbdd3c6e676 /fs/hppfs | |
| parent | 96ed753235c674a8cb261dac1a258cf6e50c6cd4 (diff) | |
| parent | 67598a1d3140a66f57aa6bcb8d22c4c2b7e910f5 (diff) | |
| parent | 5dfd7f9f88ba8539e630d04e17b93ccc7043c31c (diff) | |
| download | linux-49fe0353689901b937ff21047a14d315bbbf78f3.tar.xz | |
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