Merge branch 'for-next' of git://git.pengutronix.de/git/ukl/linux into devel-stable

Pull ARM-v7M support from Uwe Kleine-König:
"All but the last patch were in next since next-20130418 without issues.
The last patch fixes a problem in combination with

  8164f7a (ARM: 7680/1: Detect support for SDIV/UDIV from ISAR0 register)

which triggers a WARN_ON without an implemented read_cpuid_ext.

The branch merges fine into v3.10-rc1 and I'd be happy if you pulled it
for 3.11-rc1. The only missing piece to be able to run a Cortex-M3 is
the irqchip driver that will go in via Thomas Gleixner and platform
specific stuff."

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/Makefile
Simple merge

diff --cc arch/arm/include/asm/glue-cache.h
Simple merge

diff --cc arch/arm/kernel/entry-common.S
Simple merge

diff --cc arch/arm/kernel/entry-header.S
Simple merge

diff --cc arch/arm/kernel/setup.c
index 1522c7ae31b0c239901237569bad5cbb4ec7b02e,829124590e4c16eb889a48fe54183a095d589e51..ea5cd6e3beb6d8646798b66a4e7b7dceb0a004eb
--- 1/arch/arm/kernel/setup.c
--- 2/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@@ -390,8 -384,9 +401,9 @@@ static void __init feat_v6_fixup(void
   *
   * cpu_init sets up the per-CPU stacks.
   */
 -void cpu_init(void)
 +void notrace cpu_init(void)
  {
+ #ifndef CONFIG_CPU_V7M
        unsigned int cpu = smp_processor_id();
        struct stack *stk = &stacks[cpu];
  

diff --cc arch/arm/kernel/traps.c
Simple merge

diff --cc arch/arm/mm/Kconfig
Simple merge

diff --cc arch/arm/mm/Makefile
Simple merge