]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'pinctrl/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Feb 2013 04:47:49 +0000 (15:47 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Feb 2013 04:47:49 +0000 (15:47 +1100)
commit65c76ddacf45303a3c641ba41047f223a49225eb
treeab1ee5879a26dbb97d70cd4b03e5251bd69c48f9
parentb64722e1f7ef3a54aec4dedf90f9a0ebc41d1d25
parentade158eb53eed40f6090e9f7ee6ee3513ec1eec4
Merge remote-tracking branch 'pinctrl/for-next'

Conflicts:
drivers/gpio/Kconfig
drivers/pinctrl/pinctrl-nomadik.c
include/linux/mfd/abx500/ab8500.h
14 files changed:
Documentation/devicetree/bindings/vendor-prefixes.txt
arch/arm/Kconfig
arch/arm/mach-ux500/board-mop500.c
drivers/base/dd.c
drivers/gpio/Kconfig
drivers/gpio/Makefile
drivers/gpio/gpiolib-of.c
drivers/pinctrl/Kconfig
drivers/pinctrl/pinctrl-falcon.c
drivers/pinctrl/pinctrl-nomadik.c
drivers/pinctrl/pinctrl-samsung.c
drivers/pinctrl/pinctrl-xway.c
include/linux/device.h
include/linux/mfd/abx500/ab8500.h