]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'omap_dss2/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 12 Sep 2012 02:59:49 +0000 (12:59 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 12 Sep 2012 02:59:49 +0000 (12:59 +1000)
1  2 
arch/arm/mach-omap2/twl-common.c

Simple merge