Merge remote-tracking branch 'lsk/v3.10/topic/arm64-crypto' into linux-linaro-lsk
authorMark Brown <broonie@linaro.org>
Mon, 16 Jun 2014 19:14:19 +0000 (20:14 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 16 Jun 2014 19:14:19 +0000 (20:14 +0100)
commit5f856071c77e545f49400e5d7e48ab298d5c57ee
treee56ce05bc098c2a34c698645797872bcf75696d2
parenta0f20736440d550d2fca63337c4f368e28a4a1ad
parent581a6bd433c6ec65fdb5b4667258a8b275ae5c96
Merge remote-tracking branch 'lsk/v3.10/topic/arm64-crypto' into linux-linaro-lsk

Conflicts:
arch/arm64/Kconfig
arch/arm64/Kconfig
arch/arm64/Makefile
arch/arm64/include/asm/Kbuild
drivers/base/Kconfig
include/linux/mod_devicetable.h
scripts/mod/file2alias.c