Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@kernel.org>
Mon, 15 Sep 2014 06:30:04 +0000 (23:30 -0700)
committerMark Brown <broonie@kernel.org>
Mon, 15 Sep 2014 06:30:04 +0000 (23:30 -0700)
1  2 
arch/arm64/Kconfig
arch/arm64/mm/init.c

Simple merge
Simple merge