From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 24 Jul 2012 00:36:53 +0000 (-0700)
Subject: Merge tag 'pinctrl' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
X-Git-Tag: next-20120725~127
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e81218f5f0fd219bd75768d845159ba4810bdd48;p=karo-tx-linux.git

Merge tag 'pinctrl' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull arm-soc pincontrol drivers update from Arnd Bergmann:
 "We are converting platforms to use the pinctrl framework over time,
  rather than using platform specific code for the same effect.  This
  adds the respective driver for the prima2 platform."

* tag 'pinctrl' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: prima2: enable gpiolib unconditionally
  PINCTRL: SiRF: add GPIO and GPIO irq support in CSR SiRFprimaII
---

e81218f5f0fd219bd75768d845159ba4810bdd48