]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
[ARM] Merge most of the PXA work for initial merge
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Mon, 14 Jul 2008 20:28:25 +0000 (21:28 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 14 Jul 2008 22:34:46 +0000 (23:34 +0100)
commit53ffe3b440aa85af6fc4eda09b2d44bcdd312d4d
treee3ee2f392c5f73c855367cee998fc2e5774fa267
parentf0006314d37639714da9658cf4ff3f1f9f420764
parentcabb352a6455c3550f157909196845f533b0f374
[ARM] Merge most of the PXA work for initial merge

This includes PXA work up to the SPI changes for the initial merge,
since e172274ccc55d20536fbdceb6131f38e288541e0 depends on the SPI
tree being merged.

Conflicts:

arch/arm/configs/em_x270_defconfig
arch/arm/configs/xm_x270_defconfig
arch/arm/Kconfig
arch/arm/configs/xm_x270_defconfig
arch/arm/mach-pxa/cm-x270.c
arch/arm/mach-pxa/em-x270.c
drivers/usb/gadget/Kconfig
drivers/usb/gadget/pxa27x_udc.c
drivers/video/pxafb.c
include/asm-arm/arch-pxa/pxa2xx-gpio.h