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)
commit0cc4b48149ff6948dd82a039ad55cdbec49107f7
tree0d0e4a091f8bc43c2c2e9d51d1d5f4b1164b9972
parent46c13450624e36302547a2ac3695f2350fe7ffc3
parent5dfa0c73953360e07a47731e412d33dfc896bf4e
Merge branch 'acpi-battery'

* acpi-battery:
  ACPI / battery: Correctly serialise with the pending async probe