From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 20 Jul 2018 18:09:10 +0000 (-0700)
Subject: Merge tag 'acpi-4.18-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=73894397e70e537fea5331bfea9e920ae2e6387c;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'acpi-4.18-rc6' of git://git./linux/kernel/git/rafael/linux-pm

Pull ACPI fix from Rafael Wysocki:
 "Extend the recently added suspend-to-idle quirk for Thinkpad X1 Carbon
  6th to other systems from that familiy which turned out to need it too
  (Robin Johnson)"

* tag 'acpi-4.18-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI / EC: Use ec_no_wakeup on more Thinkpad X1 Carbon 6th systems
---

73894397e70e537fea5331bfea9e920ae2e6387c