Linus Torvalds 4aa705b18b 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' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC platform support updates from Kevin Hilman: "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" * tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (134 commits) ARM: zx: Add basic defconfig support for ZX296702 ARM: dts: zx: add an initial zx296702 dts and doc clk: zx: add clock support to zx296702 dt-bindings: Add #defines for ZTE ZX296702 clocks ARM: socfpga: fix build error due to secondary_startup MAINTAINERS: ARM64: EXYNOS: Extend entry for ARM64 DTS ARM: ep93xx: simone: support for SPI-based MMC/SD cards MAINTAINERS: update Shawn's email to use kernel.org one ARM: socfpga: support suspend to ram ARM: socfpga: add CPU_METHOD_OF_DECLARE for Arria 10 ARM: socfpga: use CPU_METHOD_OF_DECLARE for socfpga_cyclone5 ARM: EXYNOS: register power domain driver from core_initcall ARM: EXYNOS: use PS_HOLD based poweroff for all supported SoCs ARM: SAMSUNG: Constify platform_device_id ARM: EXYNOS: Constify irq_domain_ops ARM: EXYNOS: add coupled cpuidle support for Exynos3250 ARM: EXYNOS: add exynos_get_boot_addr() helper ARM: EXYNOS: add exynos_set_boot_addr() helper ARM: EXYNOS: make exynos_core_restart() less verbose ARM: EXYNOS: fix exynos_boot_secondary() return value on timeout ...		2015-06-26 11:34:35 -07:00
..
clk-busy.c
clk-cpu.c	clk: imx: clk-cpu: Include "clk.h" header file	2015-06-03 14:49:34 +08:00
clk-fixup-div.c
clk-fixup-mux.c
clk-gate2.c
clk-gate-exclusive.c
clk-imx1.c	ARM: imx: define an enum for gpt timer device type	2015-06-03 14:52:26 +08:00
clk-imx6q.c	ARM: clk-imx6q: refine sata's parent	2015-06-03 14:49:38 +08:00
clk-imx6sl.c
clk-imx6sx.c	ARM: SoC: platform support for v4.2	2015-06-26 11:34:35 -07:00
clk-imx7d.c	ARM: imx: add imx7d clk tree support	2015-06-03 14:49:37 +08:00
clk-imx21.c	ARM: imx: define an enum for gpt timer device type	2015-06-03 14:52:26 +08:00
clk-imx25.c
clk-imx27.c	ARM: imx: define an enum for gpt timer device type	2015-06-03 14:52:26 +08:00
clk-imx31.c	ARM: imx: define an enum for gpt timer device type	2015-06-03 14:52:26 +08:00
clk-imx35.c	ARM: imx: define an enum for gpt timer device type	2015-06-03 14:52:26 +08:00
clk-imx51-imx53.c
clk-pfd.c
clk-pllv1.c
clk-pllv2.c
clk-pllv3.c	ARM: clk: imx: update pllv3 to support imx7	2015-06-03 14:49:37 +08:00
clk-vf610.c	ARM: imx: clk-v610: Add clock for I2C2 and I2C3	2015-06-03 14:49:38 +08:00
clk.c
clk.h	ARM: imx: define an enum for gpt timer device type	2015-06-03 14:52:26 +08:00
Makefile	ARM: imx: add imx7d clk tree support	2015-06-03 14:49:37 +08:00