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)
commitf974a8ec96571535ee07880a023bcce0e3f2c76b
tree5cf09207b1ad292a55275cd0b24999fa29b9dfe8
parentc0b8556f2f8146bd38324b14b1ce00f249ba8ed9
parent4ed47896935573c8423d05bddda3f269d6e6c613
Merge branch 'machtypes' into pxa-palm
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