]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'gpio/gpio/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 5 Dec 2012 04:04:29 +0000 (15:04 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 5 Dec 2012 04:04:29 +0000 (15:04 +1100)
commitc294086295d8467413022c9ccd7ab924b81f5088
treec075c3e5bfbafecf5b273e357284025a702d0592
parentd094ed49912a45cd9ad80f3a1f839fd5a0987d38
parent835c192f3612639702d716024c1a5b66445dd860
Merge remote-tracking branch 'gpio/gpio/next'

Conflicts:
drivers/gpio/gpio-em.c
15 files changed:
arch/arm/Kconfig
drivers/gpio/Kconfig
drivers/gpio/Makefile
drivers/gpio/gpio-em.c
drivers/gpio/gpio-max730x.c
drivers/gpio/gpio-mvebu.c
drivers/gpio/gpio-omap.c
drivers/gpio/gpio-pca953x.c
drivers/gpio/gpio-pch.c
drivers/gpio/gpio-tc3589x.c
drivers/gpio/gpio-tegra.c
drivers/gpio/gpio-twl4030.c
drivers/gpio/gpio-vt8500.c
drivers/gpio/gpiolib.c
include/asm-generic/gpio.h