From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 3 Jun 2014 21:11:30 +0000 (+0200)
Subject: Merge branch 'acpi-battery'
X-Git-Tag: v3.16-rc1~30^2~5^2~12
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f58c41cc0427115e3d750ec090020892acf0fb9c;p=users%2Fhch%2Fmisc.git

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
---

f58c41cc0427115e3d750ec090020892acf0fb9c