Merge remote-tracking branch 'lsk/v3.10/topic/arm64-fpsimd' into linux-linaro-lsk
authorMark Brown <broonie@linaro.org>
Thu, 19 Jun 2014 12:17:52 +0000 (13:17 +0100)
committerMark Brown <broonie@linaro.org>
Thu, 19 Jun 2014 12:17:52 +0000 (13:17 +0100)
commitb621c22123dc6b6facafe115f6364cf80172d551
tree73d4e921b7b9ef86007473f16cd858e25a15267f
parentd7610b8eafd543c7f75568dcaeead439f31ffa53
parent92732accb6c99d8a0ae32897f04e0711962c40cc
Merge remote-tracking branch 'lsk/v3.10/topic/arm64-fpsimd' into linux-linaro-lsk

Conflicts:
arch/arm64/Kconfig
arch/arm64/include/asm/thread_info.h
arch/arm64/kernel/fpsimd.c
arch/arm64/Kconfig
arch/arm64/include/asm/thread_info.h
arch/arm64/kernel/entry.S
arch/arm64/kernel/process.c
arch/arm64/kernel/ptrace.c
arch/arm64/kernel/signal.c
arch/arm64/kernel/signal32.c