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

Trivial merge