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
..
alpha	alpha: kernel: osf_sys: Set 'kts.tv_nsec' only when 'tv' has effect	2015-05-26 10:01:51 -07:00
arc	ARC: inline cache flush toggle helpers	2015-05-11 11:21:41 +05:30
arm	ARM: SoC: platform support for v4.2	2015-06-24 21:32:13 -07:00
arm64	ARM: SoC: platform support for v4.2	2015-06-24 21:32:13 -07:00
avr32
blackfin	blackfin: Fix build error	2015-06-10 10:19:24 -07:00
c6x
cris	CRIS changes for 4.1	2015-04-26 13:31:05 -07:00
frv	Devicetree updates for 4.1:	2015-04-24 08:46:18 -07:00
hexagon
ia64	ia64: make cpu_callin_map non-volatile.	2015-06-02 10:07:03 -07:00
m32r	m32r: make flush_cpumask non-volatile.	2015-05-09 11:09:29 -07:00
m68k
metag	Metag architecture changes for v4.1	2015-04-24 07:56:50 -07:00
microblaze
mips	MIPS: MSA: bugfix - disable MSA correctly for new threads/processes.	2015-06-10 11:24:53 +02:00
mn10300	Devicetree updates for 4.1:	2015-04-24 08:46:18 -07:00
nios2	nios2 update for v4.1-rc1	2015-04-24 07:59:07 -07:00
openrisc
parisc	parisc,metag: Fix crashes due to stack randomization on stack-grows-upwards architectures	2015-05-12 22:03:44 +02:00
powerpc	This pull request includes a fix for two oopses, one on PPC	2015-05-21 20:15:16 -07:00
s390	s390/bpf: fix bpf frame pointer setup	2015-06-03 19:31:39 -07:00
score	score: Fix exception handler label	2015-06-10 10:19:47 -07:00
sh	Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma	2015-04-24 09:49:37 -07:00
sparc	sparc: Resolve conflict between sparc v9 and M7 on usage of bit 9 of TTE	2015-05-31 22:15:01 -07:00
tile	tile: properly use node_isset() on a nodemask_t	2015-04-28 10:36:45 -04:00
um
unicore32
x86	Merge git://git.kernel.org/pub/scm/virt/kvm/kvm	2015-06-17 20:54:47 -10:00
xtensa	xtensa: Provide dummy dma_alloc_attrs() and dma_free_attrs()	2015-05-25 23:03:16 +00:00
.gitignore
Kconfig