Russell King 5cd4715515 Merge branch 'ixp4xx' into devel
Conflicts:

	include/asm-arm/arch-ixp4xx/io.h
2007-05-06 20:58:29 +01:00
..
2007-05-06 20:58:29 +01:00
2007-03-28 19:45:59 +09:00
2007-03-14 08:25:52 +01:00