Merge branch 'treewide/cleanup' into next/multiplatform

The realview multiplatform series has a trivial conflict with
one of the treewide cleanups, let's just merge that in to
avoid having to resolve this later.

* treewide/cleanup:
  ARM: use "depends on" for SoC configs instead of "if" after prompt
  ARM/clocksource: use automatic DT probing for ux500 PRCMU
  ARM: use const and __initconst for smp_operations
  ARM: hisi: do not export smp_operations structures

Conflicts:
	arch/arm/mach-integrator/Kconfig

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/mach-at91/Kconfig
Simple merge

diff --cc arch/arm/mach-integrator/Kconfig
index e936cf420b4865eeb7e9a54d6722391fb16c0b58,2fa9d11c9d141625f088332bf89fecf2d645f1de..b01bdc9baf89520096ff348ba5d20e14c4aa0b87
--- 1/arch/arm/mach-integrator/Kconfig
--- 2/arch/arm/mach-integrator/Kconfig
+++ b/arch/arm/mach-integrator/Kconfig
@@@ -1,5 -1,6 +1,6 @@@
 -config ARCH_INTEGRATOR
 +menuconfig ARCH_INTEGRATOR
-       bool "ARM Ltd. Integrator family" if (ARCH_MULTI_V4T || ARCH_MULTI_V5 || ARCH_MULTI_V6)
+       bool "ARM Ltd. Integrator family"
+       depends on ARCH_MULTI_V4T || ARCH_MULTI_V5 || ARCH_MULTI_V6
        select ARM_AMBA
        select ARM_PATCH_PHYS_VIRT if MMU
        select AUTO_ZRELADDR

diff --cc arch/arm/mach-realview/core.h
Simple merge

diff --cc arch/arm/mach-realview/platsmp.c
Simple merge