]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'arm-current/fixes'
authorStephen Rothwell <sfr@canb.auug.org.au>
Sun, 6 Nov 2011 23:17:05 +0000 (10:17 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Sun, 6 Nov 2011 23:17:05 +0000 (10:17 +1100)
1  2 
arch/arm/mach-exynos/platsmp.c

Simple merge