]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'arm/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 27 Nov 2013 23:57:20 +0000 (10:57 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 27 Nov 2013 23:57:20 +0000 (10:57 +1100)
1  2 
arch/arm/mach-omap2/omap4-common.c

Simple merge