Merge remote-tracking branch 'lsk/v3.10/topic/arm64-crypto' into linux-linaro-lsk

Conflicts:
	arch/arm64/Kconfig

diff --cc arch/arm64/Kconfig
index 956445f55ead750d19cbb838d3ba67c9ac0410f7,df62331c3e4d628cb54aea25a7c5588678bdccdf..bb6571607c6ff278dce2072d8db720234eec41cf
--- 1/arch/arm64/Kconfig
--- 2/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@@ -10,14 -7,10 +10,15 @@@ config ARM6
        select ARM_AMBA
        select ARM_ARCH_TIMER
        select ARM_GIC
 +      select BUILDTIME_EXTABLE_SORT
        select CLONE_BACKWARDS
        select COMMON_CLK
 +      select CPU_PM if (SUSPEND || CPU_IDLE)
 +      select DCACHE_WORD_ACCESS
        select GENERIC_CLOCKEVENTS
 +      select GENERIC_CLOCKEVENTS_BROADCAST if SMP
+       select GENERIC_CPU_AUTOPROBE
 +      select GENERIC_EARLY_IOREMAP
        select GENERIC_IOMAP
        select GENERIC_IRQ_PROBE
        select GENERIC_IRQ_SHOW

diff --cc arch/arm64/Makefile
Simple merge

diff --cc arch/arm64/include/asm/Kbuild
Simple merge

diff --cc drivers/base/Kconfig
Simple merge

diff --cc include/linux/mod_devicetable.h
Simple merge

diff --cc scripts/mod/file2alias.c
Simple merge