diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-04-08 13:29:49 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-04-08 13:29:49 +0200 |
| commit | 62d6f06cd5c8dd2cfcc351f6e3b41d71d43c4ee3 (patch) | |
| tree | 879729729b35286003c07617e2f710516a8027f9 /drivers/base | |
| parent | Merge branches 'acpi-cleanup', 'acpi-thermal', 'acpi-video' and 'acpi-dock' (diff) | |
| parent | PM / wakeup: Correct presence vs. emptiness of wakeup_* attributes (diff) | |
| parent | PM / domains: Add pd_ignore_unused to keep power domains enabled (diff) | |
| download | linux-62d6f06cd5c8dd2cfcc351f6e3b41d71d43c4ee3.tar.xz linux-62d6f06cd5c8dd2cfcc351f6e3b41d71d43c4ee3.zip | |
Merge branches 'pm-wakeup' and 'pm-domains'
* pm-wakeup:
PM / wakeup: Correct presence vs. emptiness of wakeup_* attributes
* pm-domains:
PM / domains: Add pd_ignore_unused to keep power domains enabled