diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-10-23 23:02:58 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-10-23 23:02:58 +0200 |
| commit | 49fe0353689901b937ff21047a14d315bbbf78f3 (patch) | |
| tree | f5a3987c85aee7edfced76174b85dbbdd3c6e676 /fs/xfs/libxfs/xfs_ialloc.c | |
| parent | Merge branch 'freezer' (diff) | |
| parent | ACPI: invoke acpi_device_wakeup() with correct parameters (diff) | |
| parent | PCI / PM: handle failure to enable wakeup on PCIe PME (diff) | |
| download | linux-dev-49fe0353689901b937ff21047a14d315bbbf78f3.tar.xz linux-dev-49fe0353689901b937ff21047a14d315bbbf78f3.zip | |
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