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)
commit6ea1971e5ce9bb8f07b3dc70e10be749526b802e
treecc3cfafe2802a84068634df6d2206170def31ae5
parent626c75a01521adc3a71b43d49d4db3d956c41b9f
parentfa4b900fcaa6092a43fd60fe7dd72f8df654bcde
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
arch/arm/Kconfig
arch/arm/kernel/smp.c