Russell King ac1d426e82 Merge branch 'devel-stable' into devel ...

Conflicts:
	arch/arm/Kconfig
	arch/arm/include/asm/system.h
	arch/arm/mm/Kconfig

2010-05-17 17:24:04 +01:00

..

include/mach

…

avila-pci.c

…

avila-setup.c

…

common-pci.c

…

common.c

…

coyote-pci.c

…

coyote-setup.c

…

dsmg600-pci.c

…

dsmg600-setup.c

…

fsg-pci.c

…

fsg-setup.c

…

gateway7001-pci.c

…

gateway7001-setup.c

…

goramo_mlr.c

…

gtwx5715-pci.c

…

gtwx5715-setup.c

…

ixdp425-pci.c

…

ixdp425-setup.c

…

ixdpg425-pci.c

…

ixp4xx_npe.c

…

ixp4xx_qmgr.c

…

Kconfig

…

Makefile

…

Makefile.boot

…

nas100d-pci.c

…

nas100d-setup.c

…

nslu2-pci.c

…

nslu2-setup.c

…

wg302v2-pci.c

…

wg302v2-setup.c

…