]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'acpi-battery'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 3 Jun 2014 21:11:30 +0000 (23:11 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 3 Jun 2014 21:11:30 +0000 (23:11 +0200)
commit9a7a21a506fb67469da6cce93ca6c50e10fa9c6f
tree511fa5c1dd6bb2db1998acbee0bd16d75ae6e6c9
parent6ede4723cee37241308b39f5df00477a39d77104
parentcb30518e78bf04a12f39082279511e6a009400dc
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