Arnd Bergmann 11c7a6c5a3 Merge branch 'treewide/cleanup' into next/multiplatform ...

The realview multiplatform series has a trivial conflict with
one of the treewide cleanups, let's just merge that in to
avoid having to resolve this later.

* treewide/cleanup:
  ARM: use "depends on" for SoC configs instead of "if" after prompt
  ARM/clocksource: use automatic DT probing for ux500 PRCMU
  ARM: use const and __initconst for smp_operations
  ARM: hisi: do not export smp_operations structures

Conflicts:
	arch/arm/mach-integrator/Kconfig

2015-12-18 17:07:52 +01:00

..

cm.h

ARM: integrator: move restart to the device tree

2014-11-13 10:32:02 +01:00

common.h

soc: move SoC driver for the ARM Integrator

2014-11-13 10:32:05 +01:00

core.c

soc: move SoC driver for the ARM Integrator

2014-11-13 10:32:05 +01:00

hardware.h

ARM: integrator: localize the hardware.h header

2014-02-26 13:49:07 +01:00

impd1.c

ARM: integrator: add MMCI device to IM-PD1

2014-08-19 12:14:48 -05:00

impd1.h

ARM: integrator: localize the impd1.h header

2014-02-26 13:49:06 +01:00

integrator_ap.c

ARM: 8365/1: introduce sp804_timer_disable and remove arm_timer.h inclusion

2015-06-02 09:58:18 +01:00

integrator_cp.c

soc: move SoC driver for the ARM Integrator

2014-11-13 10:32:05 +01:00

Kconfig

Merge branch 'treewide/cleanup' into next/multiplatform

2015-12-18 17:07:52 +01:00

lm.c

ARM: integrator: localize the lm.h header

2014-02-26 13:49:05 +01:00

lm.h

ARM: integrator: localize the lm.h header

2014-02-26 13:49:05 +01:00

Makefile

ARM: integrator: move core module LED to device tree

2014-11-13 10:32:04 +01:00

Makefile.boot

ARM: 7022/1: allow to detect conflicting zreladdrs

2011-10-17 09:12:40 +01:00

pci_v3.c

ARM: integrator: Convert PCI to use generic config accessors

2015-01-29 08:34:42 -06:00

pci_v3.h

ARM: mach-integrator: Add stub for pci_v3_early_init() for !CONFIG_PCI

2013-09-25 21:59:52 -07:00