From: Mark Brown <broonie@linaro.org>
Date: Mon, 16 Jun 2014 19:14:19 +0000 (+0100)
Subject: Merge remote-tracking branch 'lsk/v3.10/topic/arm64-crypto' into linux-linaro-lsk
X-Git-Tag: firefly_0821_release~3680^2~36^2~60
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5f856071c77e545f49400e5d7e48ab298d5c57ee;p=firefly-linux-kernel-4.4.55.git

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

Conflicts:
	arch/arm64/Kconfig
---

5f856071c77e545f49400e5d7e48ab298d5c57ee
diff --cc arch/arm64/Kconfig
index 956445f55ead,df62331c3e4d..bb6571607c6f
--- a/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