Merge branch 'ixp4xx' into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sun, 6 May 2007 19:58:29 +0000 (20:58 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 6 May 2007 19:58:29 +0000 (20:58 +0100)
commit5cd47155155a32e5b944ac9fc3f3dc578e429aa0
treeea05bfdbae04eb5ffbafa2c58fc68897a3f541d6
parent6f95416ebe81b3ad63884538555efb81cb05749f
parent28bd3a0dcce11bea6f99a351cc64053dff00196e
Merge branch 'ixp4xx' into devel

Conflicts:

include/asm-arm/arch-ixp4xx/io.h
arch/arm/mach-ixp4xx/common.c
include/asm-arm/arch-ixp4xx/io.h