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
..
2015-09-11 19:18:28 +01:00
2015-11-18 11:20:24 +00:00
2015-03-25 09:53:43 +01:00
2015-05-20 23:09:51 +02:00
2014-11-21 15:24:50 +00:00
2014-11-21 15:24:50 +00:00
2012-03-28 18:30:01 +01:00
2015-10-03 16:36:45 +01:00
2014-11-21 15:24:50 +00:00
2015-09-11 19:18:28 +01:00
2014-11-21 15:25:02 +00:00
2015-10-27 09:20:50 +09:00
2014-11-21 15:24:50 +00:00
2014-11-21 15:24:50 +00:00
2015-10-03 16:36:45 +01:00
2015-04-16 13:58:29 -05:00