Russell King 5cd4715515 Merge branch 'ixp4xx' into devel ...

Conflicts:

	include/asm-arm/arch-ixp4xx/io.h

2007-05-06 20:58:29 +01:00

..

avila-pci.c

…

avila-setup.c

…

common-pci.c

…

common.c

Merge branch 'ixp4xx' into devel

2007-05-06 20:58:29 +01:00

coyote-pci.c

…

coyote-setup.c

…

dsmg600-pci.c

…

dsmg600-power.c

…

dsmg600-setup.c

…

gtwx5715-pci.c

…

gtwx5715-setup.c

…

ixdp425-pci.c

…

ixdp425-setup.c

…

ixdpg425-pci.c

…

Kconfig

…

Makefile

…

Makefile.boot

…

nas100d-pci.c

…

nas100d-power.c

…

nas100d-setup.c

…

nslu2-pci.c

…

nslu2-power.c

…

nslu2-setup.c

…