Merge branch 'hyp-boot-mode-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git...

author Russell King <rmk+kernel@arm.linux.org.uk>

Sun, 30 Sep 2012 08:03:44 +0000 (09:03 +0100)

committer Russell King <rmk+kernel@arm.linux.org.uk>

Sun, 30 Sep 2012 08:03:44 +0000 (09:03 +0100)
author Russell King <rmk+kernel@arm.linux.org.uk>
Sun, 30 Sep 2012 08:03:44 +0000 (09:03 +0100)
committer Russell King <rmk+kernel@arm.linux.org.uk>
Sun, 30 Sep 2012 08:03:44 +0000 (09:03 +0100)
diff --cc arch/arm/boot/compressed/head.S
Simple merge
diff --cc arch/arm/include/asm/assembler.h
Simple merge
diff --cc arch/arm/kernel/smp.c
Simple merge
author	Russell King <rmk+kernel@arm.linux.org.uk>
	Sun, 30 Sep 2012 08:03:44 +0000 (09:03 +0100)
committer	Russell King <rmk+kernel@arm.linux.org.uk>
	Sun, 30 Sep 2012 08:03:44 +0000 (09:03 +0100)
		1	2
arch/arm/boot/compressed/head.S	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/include/asm/assembler.h	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/smp.c	patch \|	diff1 \|	diff2 \|	blob \| history