Merge tag 'ux500-gpio-pins-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel...
authorOlof Johansson <olof@lixom.net>
Sun, 13 May 2012 02:57:34 +0000 (19:57 -0700)
committerOlof Johansson <olof@lixom.net>
Sun, 13 May 2012 02:57:34 +0000 (19:57 -0700)
commit7af07ad902cce88ebbd2ce0e681d0c541e8f95fa
tree40a5aedb583c35d16505d96ea8996c413a747fe6
parent7afeca1a30360c7b5cee94fc7ff8f350d582282a
parent08d98fe0e81cd9424ef2451ed13afe91a9a26f9f
Merge tag 'ux500-gpio-pins-for-3.5' of git://git./linux/kernel/git/linusw/linux-stericsson into next/pinctrl

ux500 GPIO and pinctrl changes for kernel 3.5

* tag 'ux500-gpio-pins-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
  ARM: ux500: switch MSP to using pinctrl for pins
  ARM: ux500: alter MSP registration to return a device pointer
  ARM: ux500: switch to using pinctrl for uart0
  ARM: ux500: delete custom pin control system
  ARM: ux500: switch over to Nomadik pinctrl driver
  pinctrl: add sleep state definition
  pinctrl/nomadik: implement pin configuration
  pinctrl/nomadik: implement pin multiplexing
  pinctrl/nomadik: reuse GPIO debug function for pins
  pinctrl/nomadik: break out single GPIO debug function
  pinctrl/nomadik: basic Nomadik pinctrl interface
  pinctrl/nomadik: !CONFIG_OF build error
  gpio: move the Nomadik GPIO driver to pinctrl

Context conflicts resolved in drivers/pinctrl/Kconfig and
drivers/pinctrl/Makefile.

Signed-off-by: Olof Johansson <olof@lixom.net>
drivers/pinctrl/Kconfig
drivers/pinctrl/Makefile
This page took 0.026401 seconds and 5 git commands to generate.