Merge remote-tracking branch 'maz/soc_desc-v3.3-rc4' into android-t114-3.4-rebased
Conflicts:
arch/arm/kernel/setup.c
arch/arm/mach-exynos/common.c
arch/arm/mach-exynos/common.h
arch/arm/mach-imx/mach-imx6q.c
arch/arm/mach-omap2/omap-hotplug.c
arch/arm/mach-omap2/omap-smp.c
arch/arm/mach-realview/core.c
arch/arm/mach-shmobile/board-ag5evm.c
arch/arm/mach-shmobile/board-kota2.c
arch/arm/mach-shmobile/board-marzen.c
arch/arm/mach-shmobile/include/mach/common.h
arch/arm/mach-shmobile/platsmp.c
arch/arm/mach-tegra/board-harmony.c
arch/arm/mach-tegra/common.c
arch/arm/mach-tegra/hotplug.c
arch/arm/mach-tegra/platsmp.c
arch/arm/mach-ux500/cpu.c
arch/arm/mach-vexpress/core.h
Change-Id: I3e0cfcfd1d187d8f1def41a1a5df1f5eedc5519f
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>