original_kernel/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
Kconfig
Makefile
Makefile.boot
fb.c
fb.h
generic.c
generic.h
nxdb500.c
nxdkn.c
nxeb500hmi.c
pfifo.c
time.c
xc.c