From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 2 May 2016 16:54:22 +0000 (-0700)
Subject: Merge tag 'gpio-v4.6-4' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=5f40adbc3eebd7e1c55ec87315e762924a36fe76;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'gpio-v4.6-4' of git://git./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"
---

5f40adbc3eebd7e1c55ec87315e762924a36fe76