Merge tag 'armsoc-soc' into test-merge

ARM: SoC: platform support for v4.2

Our SoC branch usually contains expanded support for new SoCs and
other core platform code. Some highlights from this round:

- sunxi: SMP support for A23 SoC
- socpga: big-endian support
- pxa: conversion to common clock framework
- bcm: SMP support for BCM63138
- imx: support new I.MX7D SoC
- zte: basic support for ZX296702 SoC

 Conflicts:
	arch/arm/mach-socfpga/core.h

Trivial remove/remove conflict with our cleanup branch.
Resolution: remove both sides

# gpg: Signature made Wed Jun 24 21:32:12 2015 PDT using RSA key ID D3FBC665
# gpg: Good signature from "Kevin Hilman <khilman@deeprootsystems.com>"
# gpg:                 aka "Kevin Hilman <khilman@linaro.org>"
# gpg:                 aka "Kevin Hilman <khilman@kernel.org>"

# Conflicts:
#	arch/arm/mach-socfpga/core.h

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/boot/dts/Makefile
Simple merge

diff --cc arch/arm/mach-bcm/Makefile
Simple merge

diff --cc arch/arm/mach-exynos/suspend.c
Simple merge

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

diff --cc arch/arm/mach-imx/Makefile
Simple merge

diff --cc arch/arm/mach-imx/gpc.c
Simple merge

diff --cc arch/arm/mach-socfpga/core.h
index 767c09e,2484179..7259c37
--- 1/arch/arm/mach-socfpga/core.h
--- 2/arch/arm/mach-socfpga/core.h
+++ b/arch/arm/mach-socfpga/core.h
@@@ -31,8 -33,8 +33,6 @@@
  
  #define RSTMGR_MPUMODRST_CPU1         0x2     /* CPU1 Reset */
  
- extern void __iomem *socfpga_scu_base_addr;
 -extern void socfpga_secondary_startup(void);
--
  extern void socfpga_init_clocks(void);
  extern void socfpga_sysmgr_init(void);
  

diff --cc arch/arm/mach-socfpga/headsmp.S
Simple merge

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

diff --cc arch/arm/mach-tegra/reset.h
index 0aee012,29c3dec..9c479c7
--- 1/arch/arm/mach-tegra/reset.h
--- 2/arch/arm/mach-tegra/reset.h
+++ b/arch/arm/mach-tegra/reset.h
@@@ -35,7 -35,9 +35,8 @@@ extern unsigned long __tegra_cpu_reset_
  
  void __tegra_cpu_reset_handler_start(void);
  void __tegra_cpu_reset_handler(void);
+ void __tegra20_cpu1_resettable_status_offset(void);
  void __tegra_cpu_reset_handler_end(void);
 -void tegra_secondary_startup(void);
  
  #ifdef CONFIG_PM_SLEEP
  #define tegra_cpu_lp1_mask \

diff --cc arch/arm/mach-zynq/common.h
index 7038cae,f2f0bf2..79cda2e
--- 1/arch/arm/mach-zynq/common.h
--- 2/arch/arm/mach-zynq/common.h
+++ b/arch/arm/mach-zynq/common.h
@@@ -17,9 -17,10 +17,8 @@@
  #ifndef __MACH_ZYNQ_COMMON_H__
  #define __MACH_ZYNQ_COMMON_H__
  
 -void zynq_secondary_startup(void);
 -
  extern int zynq_slcr_init(void);
  extern int zynq_early_slcr_init(void);
- extern void zynq_slcr_system_reset(void);
  extern void zynq_slcr_cpu_stop(int cpu);
  extern void zynq_slcr_cpu_start(int cpu);
  extern bool zynq_slcr_cpu_state_read(int cpu);

diff --cc drivers/clk/imx/clk-imx6sx.c
Simple merge