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
Kconfig	[ARM] 3576/1: netX: board support for NXEB500HMI development board	2006-06-19 15:29:45 +01:00
Makefile	Remove references to "make dep"	2008-01-28 23:22:13 +01:00
Makefile.boot	[ARM] 3567/2: arm: base support for Hilscher netX	2006-06-19 15:27:53 +01:00
fb.c	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
fb.h	[ARM] 3572/1: netX: framebuffer driver for Hilscher netX	2006-06-19 13:30:58 +01:00
generic.c	Merge branch 'pxa-all' into devel	2008-10-09 21:33:02 +01:00
generic.h	[ARM] 3567/2: arm: base support for Hilscher netX	2006-06-19 15:27:53 +01:00
nxdb500.c	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
nxdkn.c	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
nxeb500hmi.c	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
pfifo.c	[ARM] Convert asm/io.h to linux/io.h	2008-09-06 12:10:45 +01:00
time.c	[ARM] Convert asm/io.h to linux/io.h	2008-09-06 12:10:45 +01:00
xc.c	[ARM] Convert asm/io.h to linux/io.h	2008-09-06 12:10:45 +01:00