Merge tag 'acpi-4.7-rc1-more' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 25 May 2016 22:38:56 +0000 (15:38 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 25 May 2016 22:38:56 +0000 (15:38 -0700)
commite92677dfce88b96ade9100c77eb3f76d98d29d74
tree06505ee07962a8892b5a43a5e2479817449691a5
parent877c057d2b3cdac9f44c0fbe48e4208375395bf0
parent0cc4b48149ff6948dd82a039ad55cdbec49107f7
Merge tag 'acpi-4.7-rc1-more' of git://git./linux/kernel/git/rafael/linux-pm

Pull ACPI fix from Rafael Wysocki:
 "Additional ACPI update for v4.7-rc1

  Just one fix for incorrect async_synchronize_cookie() usage in the
  ACPI battery driver (Chris Wilson)"

* tag 'acpi-4.7-rc1-more' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI / battery: Correctly serialise with the pending async probe