summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-05-02 09:54:22 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-05-02 09:54:22 -0700
commit5f40adbc3eebd7e1c55ec87315e762924a36fe76 (patch)
tree0fe93249d2f12a80d5b45aea01575916d4cfcd5b /fs
parent9c5d1bc2b73609ada2eaba75e9c8f4963e95b977 (diff)
parent7df89e92a56a3d2c8f84aa76c61471e4a7bc24f9 (diff)
downloadlinux-5f40adbc3eebd7e1c55ec87315e762924a36fe76.tar.gz
linux-5f40adbc3eebd7e1c55ec87315e762924a36fe76.tar.bz2
linux-5f40adbc3eebd7e1c55ec87315e762924a36fe76.zip
Merge tag 'gpio-v4.6-4' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio
Pull GPIO fixes from Linus Walleij: "Here are some late but important fixes for the v4.6 kernel series. ACPI and RCAR, so two driver fixes (PM related) and a self-evident string lookup fix for ACPI GPIOs: - A serious ACPI fix targeted for stable: lookup strings were being free'd. - Revert two patches from the RCAR driver" * tag 'gpio-v4.6-4' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio: gpiolib-acpi: Duplicate con_id string when adding it to the crs lookup list Revert "gpio: rcar: Fine-grained Runtime PM support" Revert "gpio: rcar: Add Runtime PM handling for interrupts"
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions