]> err.no Git - linux-2.6/commitdiff
Merge branch 'machtypes' into pxa-palm
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Wed, 9 Jul 2008 20:34:25 +0000 (21:34 +0100)
committerRussell 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
arch/arm/mach-pxa/em-x270.c
drivers/usb/gadget/pxa27x_udc.c
drivers/video/pxafb.c
include/asm-arm/arch-pxa/pxa2xx-gpio.h

Simple merge
Simple merge
Simple merge
Simple merge