]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'pinctrl/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 7 Dec 2011 04:59:21 +0000 (15:59 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 7 Dec 2011 04:59:21 +0000 (15:59 +1100)
1  2 
arch/arm/mach-u300/core.c
drivers/gpio/Kconfig
drivers/gpio/Makefile

Simple merge
Simple merge
Simple merge