Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@kernel.org>
Sun, 18 Jan 2015 20:50:26 +0000 (20:50 +0000)
committerMark Brown <broonie@kernel.org>
Sun, 18 Jan 2015 20:50:26 +0000 (20:50 +0000)
commit22ad963d66fa029662b459d2066017f9c4a99ee9
tree34644c130d9ce3890ebe52031bf979ff3a0ebdec
parent69487098cc37d897c210f18d4b5b3dfb5d8d7ff4
parent2eb736d6b425cb932b038fd555243b9b0e59c036
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

Conflicts:
arch/arm64/include/asm/processor.h
arch/arm64/Kconfig
arch/arm64/kernel/Makefile
arch/arm64/kernel/process.c
arch/arm64/kernel/ptrace.c
arch/arm64/mm/proc.S