From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 25 May 2016 22:38:56 +0000 (-0700)
Subject: Merge tag 'acpi-4.7-rc1-more' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael... 
X-Git-Tag: Ubuntu-5.10.0-12.13~12540
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=e92677dfce88b96ade9100c77eb3f76d98d29d74;p=mirror_ubuntu-hirsute-kernel.git

Merge tag 'acpi-4.7-rc1-more' of git://git.kernel.org/pub/scm/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
---

e92677dfce88b96ade9100c77eb3f76d98d29d74