kernel-fxtec-pro1x/arch/arm/mach-footbridge
Russell King 22b61a11fd Merge branch 'dma' into devel
Conflicts:

	arch/arm/plat-mxc/dma-mx1-mx2.c
2009-02-21 21:42:50 +00:00
..
include/mach
cats-hw.c
cats-pci.c
common.c
common.h
dc21285-timer.c
dc21285.c
dma.c
ebsa285-leds.c
ebsa285-pci.c
ebsa285.c
isa-irq.c
isa-timer.c
isa.c
Kconfig
Makefile
Makefile.boot
netwinder-hw.c
netwinder-leds.c
netwinder-pci.c
personal-pci.c
personal.c
time.c