Merge branch 'baserock/bjdooks/312-rc4/be/core-v3' of git://git.baserock.org/delta...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 28 Oct 2013 00:43:41 +0000 (00:43 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 30 Oct 2013 22:20:26 +0000 (22:20 +0000)
commit2098990e7c558c175b96213d41058983e00a7919
tree361449d9c852d07544b16dd0daec5a72541e8bda
parent5e4432d3bd6b5b19e10bb263e7dbe8e74d7cf1c2
parentfdb07aee0b2b9d7d1893c97f5ce79ec355caaf1f
Merge branch 'baserock/bjdooks/312-rc4/be/core-v3' of git://git.baserock.org/delta/linux into devel-stable

Conflicts:
arch/arm/kernel/head.S

This series has been well tested and it would be great to get this
merged now.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/Kconfig
arch/arm/common/mcpm_head.S
arch/arm/include/asm/atomic.h
arch/arm/kernel/Makefile
arch/arm/kernel/head.S
arch/arm/kernel/sleep.S