diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-24 02:36:53 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-24 02:36:53 +0200 |
commit | e81218f5f0fd219bd75768d845159ba4810bdd48 (patch) | |
tree | 0694d25e9601dab913644ed8a1a7734387e08e7c /net/ipv6 | |
parent | Merge tag 'irq' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc (diff) | |
parent | Merge branch 'prima2/pinctrl' into next/pinctrl (diff) | |
download | linux-e81218f5f0fd219bd75768d845159ba4810bdd48.tar.xz linux-e81218f5f0fd219bd75768d845159ba4810bdd48.zip |
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
Diffstat (limited to 'net/ipv6')
0 files changed, 0 insertions, 0 deletions