Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Fri, 11 Oct 2013 18:26:58 +0000 (19:26 +0100)
committerMark Brown <broonie@linaro.org>
Fri, 11 Oct 2013 18:26:58 +0000 (19:26 +0100)
1  2 
arch/arm/Kconfig
arch/arm/kernel/smp.c

Simple merge
Simple merge