Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa...

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

Thu, 13 May 2010 08:56:24 +0000 (09:56 +0100)

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

Thu, 13 May 2010 08:56:24 +0000 (09:56 +0100)
author Russell King <rmk+kernel@arm.linux.org.uk>
Thu, 13 May 2010 08:56:24 +0000 (09:56 +0100)
committer Russell King <rmk+kernel@arm.linux.org.uk>
Thu, 13 May 2010 08:56:24 +0000 (09:56 +0100)
diff --cc MAINTAINERS
Simple merge
diff --cc arch/arm/mm/Kconfig
Simple merge
author	Russell King <rmk+kernel@arm.linux.org.uk>
	Thu, 13 May 2010 08:56:24 +0000 (09:56 +0100)
committer	Russell King <rmk+kernel@arm.linux.org.uk>
	Thu, 13 May 2010 08:56:24 +0000 (09:56 +0100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history