Merge remote-tracking branch 'lsk/v3.10/topic/arm64-crypto' into linux-linaro-lsk
authorMark Brown <broonie@linaro.org>
Mon, 19 May 2014 23:57:49 +0000 (00:57 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 19 May 2014 23:57:49 +0000 (00:57 +0100)
commit89901b4658d8730bc7e5dd406df456910adcaa35
tree0c554385a21ce7f813f1dd64ee9fb27dcd2f0a0e
parentcc63b3e18eea1901ca9d7954461e8993b427c6ea
parentfa9816283e16b29ea659cdb96ca532d9484f5ca4
Merge remote-tracking branch 'lsk/v3.10/topic/arm64-crypto' into linux-linaro-lsk

Conflicts:
arch/arm64/include/asm/arch_timer.h
arch/arm64/include/asm/hwcap.h
arch/arm64/include/uapi/asm/hwcap.h
arch/arm64/kernel/setup.c
arch/arm64/include/asm/arch_timer.h
arch/arm64/include/asm/cputype.h
arch/arm64/include/asm/hwcap.h
arch/arm64/kernel/setup.c