5cd4715515
Conflicts: include/asm-arm/arch-ixp4xx/io.h |
||
|---|---|---|
| .. | ||
| Kconfig | ||
| Makefile | ||
| Makefile.boot | ||
| avila-pci.c | ||
| avila-setup.c | ||
| common-pci.c | ||
| common.c | ||
| 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 | ||
| nas100d-pci.c | ||
| nas100d-power.c | ||
| nas100d-setup.c | ||
| nslu2-pci.c | ||
| nslu2-power.c | ||
| nslu2-setup.c | ||