]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'gpio-lw/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 25 Jul 2012 02:29:01 +0000 (12:29 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 25 Jul 2012 02:29:01 +0000 (12:29 +1000)
commitcf73c78562460df369da906bcd16170929b868cf
tree593259020ba0afbff7a14c20c1e1eef043d1cefb
parent191fbdd3354f95dda634f8fb1ea4d32527cfc4c5
parent4fbb0022cba37eef4a263183fdb7dbee89b299f2
Merge remote-tracking branch 'gpio-lw/for-next'

Conflicts:
drivers/gpio/gpio-mxc.c
13 files changed:
Documentation/devicetree/bindings/gpio/fsl-imx-gpio.txt
MAINTAINERS
arch/arm/boot/dts/imx51.dtsi
arch/arm/boot/dts/imx53.dtsi
arch/arm/boot/dts/imx6q.dtsi
arch/arm/mach-imx/mm-imx25.c
arch/arm/mach-imx/mm-imx3.c
arch/arm/mach-imx/mm-imx5.c
drivers/gpio/Kconfig
drivers/gpio/Makefile
drivers/gpio/gpio-mxc.c
drivers/gpio/gpio-omap.c
drivers/gpio/gpio-wm8994.c