]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'msm/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 1 Aug 2011 01:39:50 +0000 (11:39 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 1 Aug 2011 01:39:50 +0000 (11:39 +1000)
1  2 
arch/arm/mach-msm/Makefile
arch/arm/mach-msm/acpuclock-arm11.c

Simple merge
Simple merge