Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa...

author Russell King <rmk@dyn-67.arm.linux.org.uk>

Sun, 14 Jun 2009 10:00:16 +0000 (11:00 +0100)

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

Sun, 14 Jun 2009 10:00:16 +0000 (11:00 +0100)
author Russell King <rmk@dyn-67.arm.linux.org.uk>
Sun, 14 Jun 2009 10:00:16 +0000 (11:00 +0100)
committer Russell King <rmk+kernel@arm.linux.org.uk>
Sun, 14 Jun 2009 10:00:16 +0000 (11:00 +0100)
diff --cc MAINTAINERS
Simple merge
diff --cc arch/arm/common/Kconfig
Simple merge
diff --cc arch/arm/mach-pxa/palmld.c
Simple merge
diff --cc drivers/video/Kconfig
Simple merge
author	Russell King <rmk@dyn-67.arm.linux.org.uk>
	Sun, 14 Jun 2009 10:00:16 +0000 (11:00 +0100)
committer	Russell King <rmk+kernel@arm.linux.org.uk>
	Sun, 14 Jun 2009 10:00:16 +0000 (11:00 +0100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/common/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/palmld.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/video/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history