]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'pinctrl/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 18 Feb 2013 04:42:47 +0000 (15:42 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 18 Feb 2013 04:42:47 +0000 (15:42 +1100)
commitdad68599e44e93ca3d838a17ff441eb550d982ca
treec7f5fb7d9454fb487c22e48cea8196631c6ee853
parent782bf226f99ae58c079604ad35488847498c1647
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