| commit | f58c41cc0427115e3d750ec090020892acf0fb9c | [log] [tgz] |
|---|---|---|
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | Tue Jun 03 23:11:30 2014 +0200 |
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | Tue Jun 03 23:11:30 2014 +0200 |
| tree | 511fa5c1dd6bb2db1998acbee0bd16d75ae6e6c9 | |
| parent | ee7f9d7c7c1d0fde6441be495f6f14eae43af2e0 [diff] | |
| parent | e0d1f09e311fafa33b4bfd942c852671ce25ae58 [diff] |
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