mirror of https://gitee.com/openkylin/linux.git
03fa626774
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 |
||
|---|---|---|
| .. | ||
| Kconfig | ||
| Makefile | ||
| exynos-combiner.c | ||
| irq-armada-370-xp.c | ||
| irq-atmel-aic-common.c | ||
| irq-atmel-aic-common.h | ||
| irq-atmel-aic.c | ||
| irq-atmel-aic5.c | ||
| irq-bcm2835.c | ||
| irq-bcm7038-l1.c | ||
| irq-bcm7120-l2.c | ||
| irq-brcmstb-l2.c | ||
| irq-clps711x.c | ||
| irq-crossbar.c | ||
| irq-digicolor.c | ||
| irq-dw-apb-ictl.c | ||
| irq-gic-common.c | ||
| irq-gic-common.h | ||
| irq-gic-v2m.c | ||
| irq-gic-v3-its.c | ||
| irq-gic-v3.c | ||
| irq-gic.c | ||
| irq-hip04.c | ||
| irq-imgpdc.c | ||
| irq-keystone.c | ||
| irq-metag-ext.c | ||
| irq-metag.c | ||
| irq-mips-gic.c | ||
| irq-mmp.c | ||
| irq-moxart.c | ||
| irq-mtk-sysirq.c | ||
| irq-mxs.c | ||
| irq-nvic.c | ||
| irq-omap-intc.c | ||
| irq-or1k-pic.c | ||
| irq-orion.c | ||
| irq-renesas-intc-irqpin.c | ||
| irq-renesas-irqc.c | ||
| irq-s3c24xx.c | ||
| irq-sirfsoc.c | ||
| irq-st.c | ||
| irq-sun4i.c | ||
| irq-sunxi-nmi.c | ||
| irq-tb10x.c | ||
| irq-tegra.c | ||
| irq-versatile-fpga.c | ||
| irq-vf610-mscm-ir.c | ||
| irq-vic.c | ||
| irq-vt8500.c | ||
| irq-xtensa-mx.c | ||
| irq-xtensa-pic.c | ||
| irq-zevio.c | ||
| irqchip.c | ||
| irqchip.h | ||
| spear-shirq.c | ||