Kevin Hilman 03fa626774
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
2015-05-18 10:34:24 +02:00
2015-05-04 14:26:14 +02:00
2015-05-15 21:43:23 +02:00
2015-03-26 15:13:09 +00:00
2015-04-11 15:19:31 +02:00
2015-03-20 07:41:56 -06:00
2015-04-16 22:05:27 -04:00
2015-04-18 11:10:49 -04:00
2015-04-14 16:49:00 -07:00
2015-01-30 01:52:17 +01:00
2015-03-09 21:06:18 +11:00
2015-04-15 12:10:24 -04:00
2015-06-24 21:32:13 -07:00
2015-02-18 08:49:20 -08:00
2015-04-21 09:44:55 -03:00
2015-04-21 09:42:58 -07:00
2015-04-24 07:08:41 -07:00
2015-04-18 11:10:49 -04:00
2015-04-10 22:22:56 +02:00
2015-05-29 13:37:06 -07:00
2015-06-17 14:16:27 +02:00
2015-02-13 17:15:44 +10:30
2015-04-21 12:54:08 -07:00
2015-02-26 15:45:06 -08:00
2015-02-19 10:31:37 -08:00
2014-12-10 17:41:10 -08:00
2015-03-03 09:00:08 -08:00
2015-03-09 17:18:00 -07:00
2015-02-11 13:03:11 -08:00
2015-01-29 12:56:20 -07:00
2015-06-12 14:21:29 -07:00
2015-04-18 11:10:49 -04:00
2015-04-14 20:21:54 -07:00
2015-04-30 15:24:58 +10:00
2015-01-15 23:34:34 -08:00
2015-01-15 11:11:14 +01:00
2015-04-04 15:20:26 +02:00
2015-03-05 20:53:06 +01:00
2015-03-31 10:35:31 -07:00
2015-05-10 19:26:37 +02:00
2015-04-13 14:14:29 +02:00
2015-04-17 09:04:12 -04:00
2015-04-17 09:04:07 -04:00
2015-05-30 19:57:48 -07:00
2015-01-06 14:39:17 -04:00
2015-02-26 11:57:29 -08:00
2015-04-03 16:17:03 +02:00
2015-03-24 22:57:49 +01:00
2015-04-08 06:35:16 -03:00
2015-05-11 17:17:50 +02:00
2015-04-18 11:10:49 -04:00
2015-04-03 15:26:15 +02:00
2015-04-04 15:20:26 +02:00
2014-12-29 15:28:24 -07:00
2015-02-26 11:57:31 -08:00
2015-02-10 14:30:31 -08:00
2014-12-29 15:33:17 -07:00
2015-02-02 14:23:42 -08:00
2015-02-27 11:44:24 -08:00
2015-04-18 11:10:49 -04:00
2015-03-05 13:37:01 +10:30
2015-04-21 14:47:16 +05:30
2015-03-20 07:41:55 -06:00
2015-01-19 12:05:32 +01:00
2015-02-17 14:34:54 -08:00
2015-05-05 14:24:45 -05:00
2015-04-01 17:21:35 +02:00
2015-05-05 17:10:10 -07:00
2015-06-12 11:28:57 -07:00
2015-02-26 11:57:30 -08:00
2015-03-20 07:41:55 -06:00
2015-03-20 07:41:55 -06:00
2014-12-13 12:42:53 -08:00
2015-02-24 06:45:25 +09:00
2015-02-23 07:16:46 -06:00
2015-04-18 11:10:49 -04:00
2015-03-20 07:41:55 -06:00
2015-04-30 09:35:41 -07:00
2015-01-20 14:02:58 -07:00
2014-12-22 15:40:48 +01:00
2015-03-18 02:02:20 +01:00
2015-04-18 11:10:49 -04:00
2014-12-11 13:38:31 -08:00
2015-01-09 23:22:12 +01:00
2015-03-24 22:01:58 -06:00
2015-03-26 23:52:24 +01:00
2015-04-17 09:03:57 -04:00
03fa626774
