Merge branches 'pxa-ezx', 'pxa-magician' and 'pxa-palm' into pxa

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

Thu, 10 Jul 2008 18:50:38 +0000 (19:50 +0100)

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

Thu, 10 Jul 2008 18:50:38 +0000 (19:50 +0100)
author Russell King <rmk@dyn-67.arm.linux.org.uk>
Thu, 10 Jul 2008 18:50:38 +0000 (19:50 +0100)
committer Russell King <rmk+kernel@arm.linux.org.uk>
Thu, 10 Jul 2008 18:50:38 +0000 (19:50 +0100)
diff --cc MAINTAINERS
Simple merge
diff --cc arch/arm/mach-pxa/Kconfig
Simple merge
diff --cc arch/arm/mach-pxa/Makefile
Simple merge
diff --cc drivers/video/pxafb.c
Simple merge
diff --cc include/asm-arm/arch-pxa/regs-lcd.h
Simple merge
author	Russell King <rmk@dyn-67.arm.linux.org.uk>
	Thu, 10 Jul 2008 18:50:38 +0000 (19:50 +0100)
committer	Russell King <rmk+kernel@arm.linux.org.uk>
	Thu, 10 Jul 2008 18:50:38 +0000 (19:50 +0100)
		1	2	3
MAINTAINERS	patch \|	diff1 \|	diff2 \|	diff3 \|	blob \| history
arch/arm/mach-pxa/Kconfig	patch \|	diff1 \|	diff2 \|	diff3 \|	blob \| history
arch/arm/mach-pxa/Makefile	patch \|	diff1 \|	diff2 \|	diff3 \|	blob \| history
drivers/video/pxafb.c	patch \|	diff1 \|	diff2 \|	diff3 \|	blob \| history
include/asm-arm/arch-pxa/regs-lcd.h	patch \|	diff1 \|	diff2 \|	diff3 \|	blob \| history