]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge commit 'refs/next/20111005/gpio'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 13 Oct 2011 04:15:37 +0000 (15:15 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 13 Oct 2011 04:15:37 +0000 (15:15 +1100)
1  2 
arch/arm/plat-nomadik/include/plat/gpio-nomadik.h
drivers/gpio/gpio-nomadik.c

Simple merge