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	Merge branches 'machtypes', 'core', 'ep93xx', 'ks8695', 'netdev' and 'sa1100' into devel	2008-10-09 21:31:54 +01:00
adssphere.c	Merge branches 'machtypes', 'core', 'ep93xx', 'ks8695', 'netdev' and 'sa1100' into devel	2008-10-09 21:31:54 +01:00
clock.c	[ARM] Convert asm/io.h to linux/io.h	2008-09-06 12:10:45 +01:00
core.c	Merge branch 'pxa-all' into devel	2008-10-09 21:33:02 +01:00
edb9302.c	Merge branches 'machtypes', 'core', 'ep93xx', 'ks8695', 'netdev' and 'sa1100' into devel	2008-10-09 21:31:54 +01:00
edb9302a.c	Merge branches 'machtypes', 'core', 'ep93xx', 'ks8695', 'netdev' and 'sa1100' into devel	2008-10-09 21:31:54 +01:00
edb9307.c	Merge branches 'machtypes', 'core', 'ep93xx', 'ks8695', 'netdev' and 'sa1100' into devel	2008-10-09 21:31:54 +01:00
edb9312.c	Merge branches 'machtypes', 'core', 'ep93xx', 'ks8695', 'netdev' and 'sa1100' into devel	2008-10-09 21:31:54 +01:00
edb9315.c	Merge branches 'machtypes', 'core', 'ep93xx', 'ks8695', 'netdev' and 'sa1100' into devel	2008-10-09 21:31:54 +01:00
edb9315a.c	Merge branches 'machtypes', 'core', 'ep93xx', 'ks8695', 'netdev' and 'sa1100' into devel	2008-10-09 21:31:54 +01:00
gesbc9312.c	Merge branches 'machtypes', 'core', 'ep93xx', 'ks8695', 'netdev' and 'sa1100' into devel	2008-10-09 21:31:54 +01:00
gpio.c	Merge branches 'machtypes', 'core', 'ep93xx', 'ks8695', 'netdev' and 'sa1100' into devel	2008-10-09 21:31:54 +01:00
Kconfig	[ARM] 5276/1: ep93xx: allow selecting UART for early kernel messages	2008-10-03 11:03:39 +01:00
Makefile
Makefile.boot
micro9.c	Merge branches 'machtypes', 'core', 'ep93xx', 'ks8695', 'netdev' and 'sa1100' into devel	2008-10-09 21:31:54 +01:00
ts72xx.c	Merge branches 'machtypes', 'core', 'ep93xx', 'ks8695', 'netdev' and 'sa1100' into devel	2008-10-09 21:31:54 +01:00