Skip to content
Commit 8907dbaa authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'treewide/cleanup' into next/soc



Merge in cleanup to avoid internal conflicts with newly added code.

* 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

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 9cdac4a2 e3246542
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment