Merge tag 'acpi-3.13-fixup' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 20 Jan 2014 01:18:13 +0000 (17:18 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 20 Jan 2014 01:18:13 +0000 (17:18 -0800)
commit4d93540299e78d6bc3cbe83ff4b9ff8652e9f116
tree2a6cb14e949d4df0a14b92493a659af1ec8a7d3e
parent16ec54ad1502a095a35b4ae3bf6ec129111a44c5
parent2b844ba79f4a114bd228ad6fee040ffd99a0963d
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"