]> git.baikalelectronics.ru Git - kernel.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)
commit1842eda3307d59ebb2441512108ffc64a72afa40
treee3ee2f392c5f73c855367cee998fc2e5774fa267
parenta28154251594b85d439793304011d90e3c6047b8
parentbca17fb7af88126f2bda7cb04014fc32d3c5f892
[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