iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11c7a6c5a3
linux/arch/arm/mach-realview
History
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
..
board-eb.h ARM: realview: clean up header files 2015-12-18 14:09:45 +01:00
board-pb11mp.h ARM: realview: clean up header files 2015-12-18 14:09:45 +01:00
board-pb1176.h ARM: realview: clean up header files 2015-12-18 14:09:45 +01:00
board-pba8.h ARM: realview: clean up header files 2015-12-18 14:09:45 +01:00
board-pbx.h ARM: realview: clean up header files 2015-12-18 14:09:45 +01:00
core.c ARM: realview: make all header files local 2015-12-18 14:09:34 +01:00
core.h Merge branch 'treewide/cleanup' into next/multiplatform 2015-12-18 17:07:52 +01:00
hardware.h ARM: realview: clean up header files 2015-12-18 14:09:45 +01:00
hotplug.c ARM: Remove __ref on hotplug cpu die path 2015-10-22 09:55:03 -07:00
irqs-eb.h ARM: realview: clean up header files 2015-12-18 14:09:45 +01:00
irqs-pb11mp.h ARM: realview: clean up header files 2015-12-18 14:09:45 +01:00
irqs-pb1176.h ARM: realview: clean up header files 2015-12-18 14:09:45 +01:00
irqs-pba8.h ARM: realview: clean up header files 2015-12-18 14:09:45 +01:00
irqs-pbx.h ARM: realview: clean up header files 2015-12-18 14:09:45 +01:00
Kconfig ARM: realview: enable multiplatform 2015-12-18 14:08:15 +01:00
Makefile ARM: realview: build realview-dt SMP support only when used 2015-12-18 17:03:59 +01:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
platform.h ARM: realview: clean up header files 2015-12-18 14:09:45 +01:00
platsmp-dt.c ARM: realview: add an DT SMP boot method 2015-12-15 09:42:52 +01:00
platsmp.c Merge branch 'treewide/cleanup' into next/multiplatform 2015-12-18 17:07:52 +01:00
realview_eb.c ARM: realview: clean up header files 2015-12-18 14:09:45 +01:00
realview_pb11mp.c ARM: realview: clean up header files 2015-12-18 14:09:45 +01:00
realview_pb1176.c ARM: realview: clean up header files 2015-12-18 14:09:45 +01:00
realview_pba8.c ARM: realview: clean up header files 2015-12-18 14:09:45 +01:00
realview_pbx.c ARM: realview: clean up header files 2015-12-18 14:09:45 +01:00
realview-dt.c ARM: realview: clean up header files 2015-12-18 14:09:45 +01:00