diff options
| author | Rafael J. Wysocki | 2015-07-07 22:48:14 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki | 2015-07-07 22:48:14 +0200 |
| commit | d0aee67fa19260d772b07f144cf6c93e63431f67 (patch) | |
| tree | 3ab24b9981da7a57742c9dce217218d014284c85 /scripts | |
| parent | 3fc7aeeb08bfde59877e7f9a4eea3c5ebcae72be (diff) | |
| parent | 0294112ee3135fbd15eaa70015af8283642dd970 (diff) | |
| parent | d3e13ff3c1aa2403d9a5f371baac088daeb8f56d (diff) | |
| parent | 93af5e93544328285a6f65f7d47bbea8979b28fb (diff) | |
| parent | b51f9b103f58db2c5c0a20d6cee26c8bc255d3ae (diff) | |
Merge branches 'acpi-pnp', 'acpi-soc', 'pm-domains' and 'pm-sleep'
* acpi-pnp:
ACPI / PNP: Reserve ACPI resources at the fs_initcall_sync stage
* acpi-soc:
ACPI / LPSS: Fix up acpi_lpss_create_device()
* pm-domains:
PM / Domains: Avoid infinite loops in attach/detach code
* pm-sleep:
PM / hibernate: clarify resume documentation