Merge branch 'devel-stable' into for-next
authorRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 12 Nov 2013 10:58:59 +0000 (10:58 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 12 Nov 2013 10:58:59 +0000 (10:58 +0000)
commitdf762eccbadf87850fbee444d729e0f1b1e946f1
tree1bf47bbbd4ea91e343f983b3b50ec2ec73a739e1
parentec1e20a02fe33b767ffcca8920a32211492416d7
parent70d42126877b9faa272d446a6de5917614c28dd9
Merge branch 'devel-stable' into for-next

Conflicts:
arch/arm/include/asm/atomic.h
arch/arm/include/asm/hardirq.h
arch/arm/kernel/smp.c
13 files changed:
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/common/mcpm_entry.c
arch/arm/include/asm/Kbuild
arch/arm/include/asm/atomic.h
arch/arm/include/asm/hardirq.h
arch/arm/include/asm/mcpm.h
arch/arm/include/asm/spinlock.h
arch/arm/kernel/head.S
arch/arm/kernel/setup.c
arch/arm/kernel/smp.c
arch/arm/net/bpf_jit_32.c
tools/perf/config/feature-tests.mak