]> git.karo-electronics.de Git - linux-beck.git/commitdiff
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)
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


Trivial merge