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
..
bpf	bpf: fix 64-bit divide	2015-04-27 23:11:49 -04:00
configs	…
debug	…
events	perf: Disallow sparse AUX allocations for non-SG PMUs in overwrite mode	2015-05-27 09:16:20 +02:00
gcov	gcov: fix softlockups	2015-04-17 09:04:08 -04:00
irq	Merge branch 'irq/for-arm' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next/soc	2015-05-20 23:09:12 +02:00
livepatch	…
locking	lockdep: Fix a race between /proc/lock_stat and module unload	2015-06-07 15:46:30 +02:00
power	…
printk	TTY/Serial patches for 4.1-rc1	2015-04-21 09:33:10 -07:00
rcu	…
sched	sched, numa: do not hint for NUMA balancing on VM_MIXEDMAP mappings	2015-06-10 16:43:43 -07:00
time	ktime: Fix ktime_divns to do signed division	2015-05-13 10:19:35 +02:00
trace	tracing: Have filter check for balanced ops	2015-06-17 07:13:30 -04:00
.gitignore	…
Kconfig.freezer	…
Kconfig.hz	…
Kconfig.locks	…
Kconfig.preempt	…
Makefile	modsign: change default key details	2015-04-30 09:35:41 -07:00
acct.c	…
async.c	…
audit.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2015-04-26 17:22:07 -07:00
audit.h	Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/audit	2015-04-22 14:49:23 -07:00
audit_tree.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2015-04-26 17:22:07 -07:00
audit_watch.c	…
auditfilter.c	…
auditsc.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2015-04-26 17:22:07 -07:00
backtracetest.c	…
bounds.c	…
capability.c	…
cgroup.c	…
cgroup_freezer.c	…
compat.c	compat: cleanup coding in compat_get_bitmap() and compat_put_bitmap()	2015-06-04 23:57:18 +02:00
configs.c	…
context_tracking.c	…
cpu.c	…
cpu_pm.c	…
cpuset.c	…
crash_dump.c	…
cred.c	…
delayacct.c	…
dma.c	…
elfcore.c	…
exec_domain.c	…
exit.c	…
extable.c	…
fork.c	oprofile: reduce mmap_sem hold for mm->exe_file	2015-04-17 09:04:11 -04:00
freezer.c	…
futex.c	…
futex_compat.c	…
groups.c	…
hung_task.c	…
irq_work.c	…
jump_label.c	…
kallsyms.c	…
kcmp.c	…
kexec.c	kexec: allocate the kexec control page with KEXEC_CONTROL_MEMORY_GFP	2015-04-23 16:52:01 +02:00
kmod.c	…
kprobes.c	…
ksysfs.c	…
kthread.c	…
latencytop.c	…
module-internal.h	…
module.c	module: Call module notifier on failure after complete_formation()	2015-05-09 03:29:24 +09:30
module_signing.c	…
notifier.c	…
nsproxy.c	…
padata.c	…
panic.c	…
params.c	…
pid.c	fork: report pid reservation failure properly	2015-04-17 09:04:06 -04:00
pid_namespace.c	…
profile.c	…
ptrace.c	…
range.c	…
reboot.c	…
relay.c	…
resource.c	…
seccomp.c	…
signal.c	signal: remove warning about using SI_TKILL in rt_[tg]sigqueueinfo	2015-04-17 09:04:06 -04:00
smp.c	smp: Fix error case handling in smp_call_function_*()	2015-04-19 13:19:23 -07:00
smpboot.c	…
smpboot.h	…
softirq.c	…
stacktrace.c	…
stop_machine.c	…
sys.c	prctl: avoid using mmap_sem for exe_file serialization	2015-04-17 09:04:07 -04:00
sys_ni.c	…
sysctl.c	kernel/sysctl.c: detect overflows when converting to int	2015-04-17 09:04:08 -04:00
sysctl_binary.c	…
system_certificates.S	…
system_keyring.c	…
task_work.c	…
taskstats.c	…
test_kprobes.c	…
torture.c	…
tracepoint.c	…
tsacct.c	…
uid16.c	…
up.c	…
user-return-notifier.c	…
user.c	…
user_namespace.c	…
utsname.c	…
utsname_sysctl.c	…
watchdog.c	watchdog: fix double lock in watchdog_nmi_enable_all	2015-05-19 10:57:03 -07:00
workqueue.c	…
workqueue_internal.h	…