]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'imx-mxs/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 9 Dec 2013 23:38:53 +0000 (10:38 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 9 Dec 2013 23:38:53 +0000 (10:38 +1100)
1  2 
arch/arm/Kconfig.debug
drivers/pinctrl/pinctrl-nomadik.c

Simple merge
Simple merge