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
..
asm	Merge branch 'treewide/cleanup' into next/multiplatform	2015-12-18 17:07:52 +01:00
debug	ARM: debug-ll: rework footbridge handling	2015-12-15 23:43:29 +01:00
uapi/asm	ARM: wire up mlock2 syscall	2015-11-18 11:20:24 +00:00