Merge branch 'kexec/idmap' of git://git.kernel.org/pub/scm/linux/kernel/git/will...

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

Tue, 6 Dec 2011 20:27:54 +0000 (20:27 +0000)

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

Tue, 6 Dec 2011 20:27:54 +0000 (20:27 +0000)
author Russell King <rmk+kernel@arm.linux.org.uk>
Tue, 6 Dec 2011 20:27:54 +0000 (20:27 +0000)
committer Russell King <rmk+kernel@arm.linux.org.uk>
Tue, 6 Dec 2011 20:27:54 +0000 (20:27 +0000)
diff --cc arch/arm/include/asm/pgtable.h
Simple merge
diff --cc arch/arm/kernel/head.S
Simple merge
author	Russell King <rmk+kernel@arm.linux.org.uk>
	Tue, 6 Dec 2011 20:27:54 +0000 (20:27 +0000)
committer	Russell King <rmk+kernel@arm.linux.org.uk>
	Tue, 6 Dec 2011 20:27:54 +0000 (20:27 +0000)
		1	2
arch/arm/include/asm/pgtable.h	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/head.S	patch \|	diff1 \|	diff2 \|	blob \| history