Merge branches 'next/soc' and 'next/deletion' into for-next

Conflicts:
	arch/arm/mach-nuc93x/mach-nuc932evb.c

diff --cc arch/arm/Kconfig
index 9277237810e987f2f7c3aee3f267b15789fdaad5,15fab78eee29789119ef9f05e37052aee2ec861e,970055b7584061ec8e9e06a1748ce4290aea3c67..bdb9551be5510ff35e00dd0401c95f3a3a22cf3f
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
--- 3/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@@ -1273,32 -1289,6 -1261,18 +1281,32 @@@@ config ARM_ERRATA_75432
          This workaround defines cpu_relax() as smp_mb(), preventing correctly
          written polling loops from denying visibility of updates to memory.
   
 + config ARM_ERRATA_364296
 +      bool "ARM errata: Possible cache data corruption with hit-under-miss enabled"
 +      depends on CPU_V6 && !SMP
 +      help
 +        This options enables the workaround for the 364296 ARM1136
 +        r0p2 erratum (possible cache data corruption with
 +        hit-under-miss enabled). It sets the undocumented bit 31 in
 +        the auxiliary control register and the FI bit in the control
 +        register, thus disabling hit-under-miss without putting the
 +        processor into full low interrupt latency mode. ARM11MPCore
 +        is not affected.
 + 
 ++config ARM_ERRATA_764369
 ++     bool "ARM errata: Data cache line maintenance operation by MVA may not succeed"
 ++     depends on CPU_V7 && SMP
 ++     help
 ++       This option enables the workaround for erratum 764369
 ++       affecting Cortex-A9 MPCore with two or more processors (all
 ++       current revisions). Under certain timing circumstances, a data
 ++       cache line maintenance operation by MVA targeting an Inner
 ++       Shareable memory region may fail to proceed up to either the
 ++       Point of Coherency or to the Point of Unification of the
 ++       system. This workaround adds a DSB instruction before the
 ++       relevant cache maintenance functions and sets a specific bit
 ++       in the diagnostic control register of the SCU.
 ++
   endmenu
   
   source "arch/arm/common/Kconfig"

diff --cc arch/arm/Makefile
Simple merge