Merge nommu tree

author Russell King <[email protected]>

Tue, 28 Mar 2006 21:05:10 +0000 (22:05 +0100)

committer Russell King <[email protected]>

Tue, 28 Mar 2006 21:05:10 +0000 (22:05 +0100)
author Russell King <[email protected]>
Tue, 28 Mar 2006 21:05:10 +0000 (22:05 +0100)
committer Russell King <[email protected]>
Tue, 28 Mar 2006 21:05:10 +0000 (22:05 +0100)
diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/Makefile
Simple merge
diff --cc arch/arm/kernel/head.S
Simple merge
diff --cc arch/arm/kernel/traps.c
Simple merge
author	Russell King <[email protected]>
	Tue, 28 Mar 2006 21:05:10 +0000 (22:05 +0100)
committer	Russell King <[email protected]>
	Tue, 28 Mar 2006 21:05:10 +0000 (22:05 +0100)
		1	2
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/head.S	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/traps.c	patch \|	diff1 \|	diff2 \|	blob \| history