linux_dsm_epyc7002/arch/arm/mach-exynos
Kevin Hilman 03fa626774 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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJVi4RMAAoJEFk3GJrT+8Zl6/kP/1Rv9O++1Kxua6R54Og6AF1J
 0miFr2fnUrUWUYg/NVbseRH5bBe6N6ir3SQMfde8W2/QibEjOoEwSwrle+mC/eiq
 CE0x0gtyRvXMrMU/FWkOvbmmw9uv5oz1z3IHZV6AiecNuSMLUBPfamryikQ8C+d1
 O/QZtX543tJQJDOBihO5cuhoVVM37UX0unNmqGsyswlyqTPF8FxcIJAYVNtnxjmj
 AFaOB0nDJKLKFTiX2Ype2wOxxJX1lrLatNo4W4T+YaaK+i1uCOhgTdSN+n49K7YA
 KNDFEgZFQqT8VMJyG+eJVeYF+cI7yWQ7lBzIftPUjPk/7+dIHBjWPz2QdjVz3U38
 kxncf4S9xGAF5G2rcKe4mFrfT3Y8QLWQpA/jFs06yLwW1O3Hlfq3DzMdGNcF7hth
 17LOP8namn9+NepZEp/vAlFzRRypxWWtbkPNBIItkImC6zn0IiGjBy50DE1io27W
 hmQcnMb7d+0wWl2Y8OmR2lZSB97JiRZkRYMCVHVt+0zGJzp4prLvl9wbjh1VXkPv
 ERCDJ9nCmZsl7ZVmIXMI7KNXYuPNp7R/QAzCvuSUueswF0qxTAQ0VSSBwRMqvQsQ
 UUNC6p63VnjUeMUdn2EBsUQZ0Uqw3t2U5TtvooHNt9FkiGsSpwjWrvVD+LItaPoJ
 GPeeJrJaYQsDvTrO8wjU
 =ZtPK
 -----END PGP SIGNATURE-----

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
2015-06-24 21:32:13 -07:00
..
include/mach ARM: SAMSUNG: remove unused DMA infrastructure 2015-01-24 13:09:54 +09:00
common.h ARM: EXYNOS: add coupled cpuidle support for Exynos3250 2015-06-06 02:17:57 +09:00
exynos-pmu.h ARM: EXYNOS: Move PMU specific definitions from common.h 2014-11-21 22:49:44 +09:00
exynos-smc.S ARM: EXYNOS: Add support for secure monitor calls 2013-04-09 01:52:06 +09:00
exynos.c ARM: EXYNOS: add coupled cpuidle support for Exynos3250 2015-06-06 02:17:57 +09:00
firmware.c ARM: EXYNOS: add coupled cpuidle support for Exynos3250 2015-06-06 02:17:57 +09:00
headsmp.S ARM: EXYNOS: Remove file path from comment section 2014-07-15 08:40:32 +09:00
Kconfig arm-cci: Split the code for PMU vs driver support 2015-03-27 13:44:43 +00:00
Makefile Merge branch 'v3.19-next/cleanup-samsung' into v3.19-next/mach-exynos 2014-11-21 21:40:23 +09:00
Makefile.boot ARM: dts: Add basic dts file for Samsung Trats board 2012-09-21 10:50:27 +09:00
mcpm-exynos.c ARM: Exynos: migrate DCSCB to the new MCPM backend abstraction 2015-04-03 12:52:49 -07:00
mfc.h ARM: SAMSUNG: Reorganize calls to reserve memory for MFC 2014-03-21 02:00:09 +09:00
platsmp.c ARM: EXYNOS: add coupled cpuidle support for Exynos3250 2015-06-06 02:17:57 +09:00
pm_domains.c ARM: EXYNOS: register power domain driver from core_initcall 2015-06-06 02:18:03 +09:00
pm.c ARM: EXYNOS: add coupled cpuidle support for Exynos3250 2015-06-06 02:17:57 +09:00
pmu.c ARM: EXYNOS: use PS_HOLD based poweroff for all supported SoCs 2015-06-06 02:18:02 +09:00
regs-pmu.h ARM: EXYNOS: add AFTR mode support for Exynos3250 2015-03-27 02:35:48 +09:00
sleep.S ARM: 8325/1: exynos: move resume code to .text section 2015-03-29 23:11:57 +01:00
smc.h ARM: EXYNOS: add AFTR mode support for Exynos3250 2015-03-27 02:35:48 +09:00
suspend.c ARM: SoC: platform support for v4.2 2015-06-24 21:32:13 -07:00