Merge branch 'pending-misc' (early part) into devel

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

Fri, 4 Dec 2009 14:59:47 +0000 (14:59 +0000)

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

Fri, 4 Dec 2009 14:59:47 +0000 (14:59 +0000)
author Russell King <rmk+kernel@arm.linux.org.uk>
Fri, 4 Dec 2009 14:59:47 +0000 (14:59 +0000)
committer Russell King <rmk+kernel@arm.linux.org.uk>
Fri, 4 Dec 2009 14:59:47 +0000 (14:59 +0000)
diff --cc MAINTAINERS
Simple merge
diff --cc arch/arm/mm/Kconfig
Simple merge
author	Russell King <rmk+kernel@arm.linux.org.uk>
	Fri, 4 Dec 2009 14:59:47 +0000 (14:59 +0000)
committer	Russell King <rmk+kernel@arm.linux.org.uk>
	Fri, 4 Dec 2009 14:59:47 +0000 (14:59 +0000)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history