From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 25 May 2015 22:15:54 +0000 (-0700)
Subject: Merge tag 'pinctrl-v4.1-4' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw... 
X-Git-Tag: firefly_0821_release~176^2~1728
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a8b253b9f253c05e5e10b829b8d1fb24556f4b56;p=firefly-linux-kernel-4.4.55.git

Merge tag 'pinctrl-v4.1-4' of git://git./linux/kernel/git/linusw/linux-pinctrl

Pull pin control fixes from Linus Walleij:
 "Here are some three pin control fixes for the v4.1 cycle, all
  driver-specific.  Business as usual and calm as it should be in this
  portion of the merge window.

   - IRQ trigger fix for the Intel Cherryview

   - GPIO-to-pin mapping fix for the Cygnus driver

   - GPIO-to-pin mapping fix for the Meson8b driver"

* tag 'pinctrl-v4.1-4' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
  pinctrl: Fix gpio/pin mapping for Meson8b
  pinctrl: cygnus: fixed incorrect GPIO-pin mapping
  pinctrl: cherryview: Read triggering type from HW if not set when requested
---

a8b253b9f253c05e5e10b829b8d1fb24556f4b56