diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-03-25 13:52:36 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-03-25 13:52:36 -0700 |
commit | 1dfb642b10158b45068102402decc3bcf853cb76 (patch) | |
tree | 61df9295080103d9189d40d784383e6db92fbb3f /net/hsr | |
parent | e2cf67f6689a218b4d8e606e90a12491a9cfa366 (diff) | |
parent | 0c625ccfe6f754d0896b8881f5c85bcb81699f1f (diff) | |
download | linux-1dfb642b10158b45068102402decc3bcf853cb76.tar.bz2 |
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 'net/hsr')
0 files changed, 0 insertions, 0 deletions