Merge branch 'treewide/cleanup' into next/cleanup
authorArnd Bergmann <arnd@arndb.de>
Fri, 11 Dec 2015 23:17:55 +0000 (00:17 +0100)
committerArnd Bergmann <arnd@arndb.de>
Fri, 11 Dec 2015 23:17:55 +0000 (00:17 +0100)
commit80f7273c05b3447c5890ee6eb639d7c49ce100d7
tree478a948e76d8f660b0f3b898c1094df5b172e433
parent31ade3b83e1821da5fbb2f11b5b3d4ab2ec39db8
parente324654294907a420ab3773efe8849a935f37bf0
Merge branch 'treewide/cleanup' into next/cleanup

These are a couple of changes that may conflict with other branches,
so we're keeping them in a separate branch that can be merged into
those if necessary.

* 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