From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 20 Jan 2014 01:18:13 +0000 (-0800)
Subject: Merge tag 'acpi-3.13-fixup' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael... 
X-Git-Tag: firefly_0821_release~176^2~4663
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4d93540299e78d6bc3cbe83ff4b9ff8652e9f116;p=firefly-linux-kernel-4.4.55.git

Merge tag 'acpi-3.13-fixup' of git://git./linux/kernel/git/rafael/linux-pm

Pull last-minute ACPI fix from Rafael Wysocki:
 "This reverts a commit that causes the Alan Cox' ASUS T100TA to "crash
  and burn" during boot if the Baytrail pinctrl driver is compiled in"

* tag 'acpi-3.13-fixup' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  Revert "ACPI: Add BayTrail SoC GPIO and LPSS ACPI IDs"
---

4d93540299e78d6bc3cbe83ff4b9ff8652e9f116