Merge branch 'acpi-battery'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 25 May 2016 20:11:28 +0000 (22:11 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 25 May 2016 20:11:28 +0000 (22:11 +0200)
* acpi-battery:
  ACPI / battery: Correctly serialise with the pending async probe


Trivial merge