linux/arch/arm/mach-netx
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
fb.c [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
fb.h
generic.c Merge branch 'pxa-all' into devel 2008-10-09 21:33:02 +01:00
generic.h
Kconfig
Makefile
Makefile.boot
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