kernel-fxtec-pro1x/arch/arm/mach-s3c2440
Russell King 7e69a8c4d0 Merge branch 's3c-move' into devel
Conflicts:

	arch/arm/mach-versatile/core.c
2008-10-14 22:24:51 +01:00
..
clock.c
dma.c
dsc.c
irq.c
Kconfig
mach-anubis.c
mach-at2440evb.c
mach-nexcoder.c
mach-osiris.c
mach-rx3715.c
mach-smdk2440.c
Makefile
s3c2440.c