summaryrefslogtreecommitdiff
path: root/drivers/nfc
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-03-25 23:52:36 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2020-03-25 23:52:36 +0300
commit1dfb642b10158b45068102402decc3bcf853cb76 (patch)
tree61df9295080103d9189d40d784383e6db92fbb3f /drivers/nfc
parente2cf67f6689a218b4d8e606e90a12491a9cfa366 (diff)
parent0c625ccfe6f754d0896b8881f5c85bcb81699f1f (diff)
downloadlinux-1dfb642b10158b45068102402decc3bcf853cb76.tar.xz
Merge tag 'gpio-v5.6-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio
Pull GPIO fixes from Linus Walleij: - One core quirk by myself to fix the .irq_disable() semantics when the gpiolib core takes over this callback. - The rest is an elaborate series of four patches fixing Intel laptop ACPI wakeup quirks. * tag 'gpio-v5.6-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio: gpiolib: acpi: Add quirk to ignore EC wakeups on HP x2 10 CHT + AXP288 model gpiolib: acpi: Add quirk to ignore EC wakeups on HP x2 10 BYT + AXP288 model gpiolib: acpi: Rework honor_wakeup option into an ignore_wake option gpiolib: acpi: Correct comment for HP x2 10 honor_wakeup quirk gpiolib: Fix irq_disable() semantics
Diffstat (limited to 'drivers/nfc')
0 files changed, 0 insertions, 0 deletions