[ARM] Merge remaining IOP code
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Tue, 20 Feb 2007 10:52:01 +0000 (10:52 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 20 Feb 2007 10:52:43 +0000 (10:52 +0000)
Conflicts:
include/asm-arm/arch-at91rm9200/entry-macro.S

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

Trivial merge