OSDN Git Service

Merge branch 'treewide/cleanup' into next/multiplatform
authorArnd Bergmann <arnd@arndb.de>
Fri, 18 Dec 2015 16:07:52 +0000 (17:07 +0100)
committerArnd Bergmann <arnd@arndb.de>
Fri, 18 Dec 2015 16:07:52 +0000 (17:07 +0100)
commit11c7a6c5a3232e2ff1127d80d609daa95df5d5d4
tree52a7bfe7994eb7f0c9d4b9301ad3c27f9bb9ad71
parent3f93c644c92db1abb6149da712713132e0b37cfc
parente324654294907a420ab3773efe8849a935f37bf0
Merge branch 'treewide/cleanup' into next/multiplatform

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
arch/arm/Kconfig
arch/arm/mach-at91/Kconfig
arch/arm/mach-integrator/Kconfig
arch/arm/mach-realview/core.h
arch/arm/mach-realview/platsmp.c