From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 11 Dec 2015 23:17:55 +0000 (+0100)
Subject: Merge branch 'treewide/cleanup' into next/cleanup
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=80f7273c05b3447c5890ee6eb639d7c49ce100d7;p=linux-beck.git

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
---

80f7273c05b3447c5890ee6eb639d7c49ce100d7