linux/arch/arm/mach-integrator
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
common.h
core.c
hardware.h
impd1.c
impd1.h
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
Kconfig Merge branch 'treewide/cleanup' into next/multiplatform 2015-12-18 17:07:52 +01:00
lm.c
lm.h
Makefile
Makefile.boot
pci_v3.c ARM: integrator: Convert PCI to use generic config accessors 2015-01-29 08:34:42 -06:00
pci_v3.h