]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'gpio/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 16 Jan 2014 05:21:35 +0000 (16:21 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 16 Jan 2014 05:21:35 +0000 (16:21 +1100)
commita1588ff8e38c1293f1ac267191e9321cbb9e7520
treeef095f8cc807ad3f45dd0f7d802bbed21a16b47e
parent7e92f4584b3bb9c93b47db6ac00e5f91de2cbb85
parent785acec3eecf4c21bab9e24afb5d354b57a72e03
Merge remote-tracking branch 'gpio/for-next'

Conflicts:
arch/xtensa/Kconfig
drivers/leds/leds-s3c24xx.c
18 files changed:
arch/arm/Kconfig
arch/arm/mach-s3c24xx/simtec-usb.c
arch/arm/mach-s3c64xx/Kconfig
arch/arm/mach-s3c64xx/mach-mini6410.c
arch/arm/mach-s3c64xx/mach-smartq.c
arch/xtensa/Kconfig
drivers/gpio/Kconfig
drivers/gpio/Makefile
drivers/gpio/gpio-msm-v2.c
drivers/gpio/gpio-rcar.c
drivers/gpio/gpio-twl4030.c
drivers/gpio/gpiolib.c
drivers/leds/leds-s3c24xx.c
drivers/mmc/host/sdhci-acpi.c
drivers/pinctrl/pinctrl-as3722.c
drivers/pinctrl/pinctrl-at91.c
drivers/pinctrl/pinctrl-baytrail.c
drivers/pinctrl/pinctrl-nomadik.c