]> 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)
commitabbaf4d552b7e9c7f1ee4204db943dba5b73f82b
tree511fa5c1dd6bb2db1998acbee0bd16d75ae6e6c9
parente67e34a203f540309a8276d9b8d76cf3d9cf7f71
parent3fc1633ddb3b2dc36047a8b6db8bdc3f138cb085
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