diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-06-03 23:11:30 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-06-03 23:11:30 +0200 |
commit | f58c41cc0427115e3d750ec090020892acf0fb9c (patch) | |
tree | 511fa5c1dd6bb2db1998acbee0bd16d75ae6e6c9 /kernel/power | |
parent | Merge branch 'pm-sleep' (diff) | |
parent | ACPI / battery: wakeup the system only when necessary (diff) | |
download | linux-f58c41cc0427115e3d750ec090020892acf0fb9c.tar.xz linux-f58c41cc0427115e3d750ec090020892acf0fb9c.zip |
Merge branch 'acpi-battery'
* acpi-battery:
ACPI / battery: wakeup the system only when necessary
power_supply: allow power supply devices registered w/o wakeup source
ACPI / battery: introduce support for POWER_SUPPLY_PROP_CAPACITY_LEVEL
ACPI / battery: Accelerate battery resume callback
Diffstat (limited to 'kernel/power')
0 files changed, 0 insertions, 0 deletions