]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'gpio/gpio/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 4 Oct 2011 04:50:15 +0000 (15:50 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 4 Oct 2011 04:50:15 +0000 (15:50 +1100)
1  2 
arch/arm/plat-nomadik/include/plat/gpio-nomadik.h
drivers/gpio/gpio-nomadik.c

Simple merge