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

Simple merge