Russell King 3f30a09a61 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		2008-10-09 21:33:02 +01:00
..
include/mach	[ARM] Convert asm/io.h to linux/io.h	2008-09-06 12:10:45 +01:00
cats-hw.c	[ARM] Convert asm/io.h to linux/io.h	2008-09-06 12:10:45 +01:00
cats-pci.c	[ARM] CATS: Do not try and map bad PCI IRQ numbers	2008-08-09 13:51:53 +01:00
common.c	[ARM] Convert asm/io.h to linux/io.h	2008-09-06 12:10:45 +01:00
common.h
dc21285-timer.c
dc21285.c	[ARM] Convert asm/io.h to linux/io.h	2008-09-06 12:10:45 +01:00
dma.c	[ARM] Convert asm/io.h to linux/io.h	2008-09-06 12:10:45 +01:00
ebsa285-leds.c
ebsa285-pci.c
ebsa285.c
isa-irq.c	Merge branch 'pxa-all' into devel	2008-10-09 21:33:02 +01:00
isa-timer.c	[ARM] Convert asm/io.h to linux/io.h	2008-09-06 12:10:45 +01:00
isa.c
Kconfig
Makefile
Makefile.boot
netwinder-hw.c	[ARM] Convert asm/io.h to linux/io.h	2008-09-06 12:10:45 +01:00
netwinder-leds.c
netwinder-pci.c
personal-pci.c
personal.c
time.c	Merge branch 'ptebits' into devel	2008-10-09 21:31:56 +01:00