Merge branch 'highmem' into devel

author Russell King <[email protected]>

Tue, 24 Mar 2009 22:47:45 +0000 (22:47 +0000)

committer Russell King <[email protected]>

Tue, 24 Mar 2009 22:47:45 +0000 (22:47 +0000)
author Russell King <[email protected]>
Tue, 24 Mar 2009 22:47:45 +0000 (22:47 +0000)
committer Russell King <[email protected]>
Tue, 24 Mar 2009 22:47:45 +0000 (22:47 +0000)
diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/mm/Makefile
Simple merge
diff --cc arch/arm/mm/mmu.c
Simple merge
author	Russell King <[email protected]>
	Tue, 24 Mar 2009 22:47:45 +0000 (22:47 +0000)
committer	Russell King <[email protected]>
	Tue, 24 Mar 2009 22:47:45 +0000 (22:47 +0000)
		1	2
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/mmu.c	patch \|	diff1 \|	diff2 \|	blob \| history