Merge branch 'treewide/cleanup' into next/multiplatform

Browse source

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

...

This commit is contained in:

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

parent 3f93c644c9 e324654294

commit 11c7a6c5a3

94 changed files with 181 additions and 203 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

20

include/linux/clksrc-dbx500-prcmu.h

View file