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.h

…

coyote.h

…

cpu.h

[ARM] 4320/1: ixp4xx: cpu type detection stuff cleanup

2007-04-21 20:52:01 +01:00

debug-macro.S

…

dma.h

…

dsmg600.h

[ARM] 4318/2: DSM-G600 Board Support

2007-05-05 10:06:49 +01:00

entry-macro.S

[ARM] 4311/1: ixp4xx: add KIXRP435 platform

2007-04-21 20:51:55 +01:00

gpio.h

[ARM] 4275/1: generic gpio layer for ixp4xx

2007-04-21 20:51:42 +01:00

gtwx5715.h

…

hardware.h

[ARM] 4318/2: DSM-G600 Board Support

2007-05-05 10:06:49 +01:00

io.h

Merge branch 'ixp4xx' into devel

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

irqs.h

[ARM] 4318/2: DSM-G600 Board Support

2007-05-05 10:06:49 +01:00

ixdp425.h

…

ixp4xx-regs.h

[ARM] 4320/1: ixp4xx: cpu type detection stuff cleanup

2007-04-21 20:52:01 +01:00

memory.h

…

nas100d.h

…

nslu2.h

…

platform.h

…

prpmc1100.h

…

system.h

…

timex.h

…

udc.h

…

uncompress.h

…

vmalloc.h

…