Merge branch 'pxa-all' into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Thu, 9 Oct 2008 20:33:02 +0000 (21:33 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 9 Oct 2008 20:33:02 +0000 (21:33 +0100)
commit3f30a09a612bac2b531a206c2a58a292dd7ff182
tree62741c2f78aeb3009c66dbcf014ebff2e034e597
parent9e165acf1b9e37af7c0fa39399b43d0bd8600039
parentfda50a1c49ad7483eaa29a268d560422c413933f
Merge branch 'pxa-all' into devel

Conflicts:

arch/arm/mach-pxa/Kconfig
arch/arm/mach-pxa/corgi.c
arch/arm/mach-pxa/include/mach/hardware.h
arch/arm/mach-pxa/spitz.c
28 files changed:
MAINTAINERS
arch/arm/Kconfig
arch/arm/common/locomo.c
arch/arm/mach-at91/gpio.c
arch/arm/mach-ep93xx/core.c
arch/arm/mach-footbridge/isa-irq.c
arch/arm/mach-h720x/common.c
arch/arm/mach-imx/irq.c
arch/arm/mach-integrator/integrator_cp.c
arch/arm/mach-ixp2000/core.c
arch/arm/mach-ixp2000/ixdp2x00.c
arch/arm/mach-ixp2000/ixdp2x01.c
arch/arm/mach-netx/generic.c
arch/arm/mach-omap1/fpga.c
arch/arm/mach-orion5x/irq.c
arch/arm/mach-pxa/Kconfig
arch/arm/mach-pxa/corgi.c
arch/arm/mach-pxa/gpio.c
arch/arm/mach-pxa/include/mach/hardware.h
arch/arm/mach-pxa/spitz.c
arch/arm/mach-s3c2410/bast-irq.c
arch/arm/mach-s3c2412/irq.c
arch/arm/mach-s3c2440/irq.c
arch/arm/mach-s3c2443/irq.c
arch/arm/mach-versatile/core.c
arch/arm/plat-omap/gpio.c
arch/arm/plat-s3c24xx/irq.c
arch/arm/plat-s3c24xx/s3c244x-irq.c