Merge branch 'machtypes' into pxa-palm

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

Wed, 9 Jul 2008 20:34:25 +0000 (21:34 +0100)

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

Wed, 9 Jul 2008 20:34:25 +0000 (21:34 +0100)
author Russell King <rmk@dyn-67.arm.linux.org.uk>
Wed, 9 Jul 2008 20:34:25 +0000 (21:34 +0100)
committer Russell King <rmk+kernel@arm.linux.org.uk>
Wed, 9 Jul 2008 20:34:25 +0000 (21:34 +0100)
diff --cc arch/arm/mach-pxa/cm-x270.c
Simple merge
diff --cc arch/arm/mach-pxa/em-x270.c
Simple merge
diff --cc drivers/usb/gadget/pxa27x_udc.c
Simple merge
diff --cc drivers/video/pxafb.c
Simple merge
diff --cc include/asm-arm/arch-pxa/pxa2xx-gpio.h
Simple merge
author	Russell King <rmk@dyn-67.arm.linux.org.uk>
	Wed, 9 Jul 2008 20:34:25 +0000 (21:34 +0100)
committer	Russell King <rmk+kernel@arm.linux.org.uk>
	Wed, 9 Jul 2008 20:34:25 +0000 (21:34 +0100)
		1	2
arch/arm/mach-pxa/cm-x270.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/em-x270.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/pxa27x_udc.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/video/pxafb.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/asm-arm/arch-pxa/pxa2xx-gpio.h	patch \|	diff1 \|	diff2 \|	blob \| history