]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'gpio/gpio/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 23 Sep 2011 03:47:16 +0000 (13:47 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 23 Sep 2011 03:47:16 +0000 (13:47 +1000)
1  2 
arch/arm/plat-nomadik/include/plat/gpio-nomadik.h
drivers/gpio/gpio-nomadik.c

Simple merge