Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorAlex Shi <alex.shi@linaro.org>
Thu, 23 Apr 2015 06:55:22 +0000 (14:55 +0800)
committerAlex Shi <alex.shi@linaro.org>
Thu, 23 Apr 2015 06:55:22 +0000 (14:55 +0800)
1  2 
arch/arm64/kernel/setup.c
arch/arm64/mm/init.c

Simple merge
Simple merge