summaryrefslogtreecommitdiffstats
path: root/include/asm-generic
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-01-19 17:18:13 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2014-01-19 17:18:13 -0800
commit4d93540299e78d6bc3cbe83ff4b9ff8652e9f116 (patch)
tree2a6cb14e949d4df0a14b92493a659af1ec8a7d3e /include/asm-generic
parent16ec54ad1502a095a35b4ae3bf6ec129111a44c5 (diff)
parent2b844ba79f4a114bd228ad6fee040ffd99a0963d (diff)
downloadlinux-4d93540299e78d6bc3cbe83ff4b9ff8652e9f116.tar.bz2
Merge tag 'acpi-3.13-fixup' of git://git.kernel.org/pub/scm/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"
Diffstat (limited to 'include/asm-generic')
0 files changed, 0 insertions, 0 deletions