From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 23 May 2017 02:26:33 +0000 (-0700)
Subject: Merge tag 'acpi-4.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael... 
X-Git-Tag: v4.14-rc1~856
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=74a9e7dbbc4a45ee78560f36903f3c3b1f553928;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'acpi-4.12-rc3' of git://git./linux/kernel/git/rafael/linux-pm

Pull ACPI fixes from Rafael Wysocki:
 "These revert a 4.11 change that turned out to be problematic and add a
  .gitignore file.

  Specifics:

   - Revert a 4.11 commit related to the ACPI-based handling of laptop
     lids that made changes incompatible with existing user space stacks
     and broke things there (Lv Zheng).

   - Add .gitignore to the ACPI tools directory (Prarit Bhargava)"

* tag 'acpi-4.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  Revert "ACPI / button: Remove lid_init_state=method mode"
  tools/power/acpi: Add .gitignore file
---

74a9e7dbbc4a45ee78560f36903f3c3b1f553928