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

author root <root@dyn-67.arm.linux.org.uk>

Tue, 24 Mar 2009 22:04:25 +0000 (22:04 +0000)

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

Tue, 24 Mar 2009 22:04:25 +0000 (22:04 +0000)
author root <root@dyn-67.arm.linux.org.uk>
Tue, 24 Mar 2009 22:04:25 +0000 (22:04 +0000)
committer Russell King <rmk+kernel@arm.linux.org.uk>
Tue, 24 Mar 2009 22:04:25 +0000 (22:04 +0000)
diff --cc MAINTAINERS
Simple merge
diff --cc arch/arm/mach-pxa/tosa.c
Simple merge
diff --cc arch/arm/mm/Kconfig
Simple merge
diff --cc drivers/video/pxafb.c
Simple merge
author	root <root@dyn-67.arm.linux.org.uk>
	Tue, 24 Mar 2009 22:04:25 +0000 (22:04 +0000)
committer	Russell King <rmk+kernel@arm.linux.org.uk>
	Tue, 24 Mar 2009 22:04:25 +0000 (22:04 +0000)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/tosa.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/video/pxafb.c	patch \|	diff1 \|	diff2 \|	blob \| history