Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@kernel.org>
Fri, 10 Oct 2014 18:17:22 +0000 (19:17 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 10 Oct 2014 18:17:22 +0000 (19:17 +0100)
1  2 
arch/arm/Kconfig
arch/arm/mm/Makefile

Simple merge
Simple merge