]> git.baikalelectronics.ru Git - kernel.git/commit
[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)
commit05d7e836b4fb09cc9e20334ea0ff0d8d1d8ea9d6
tree8960fa71eb73d0f1185e893192411cb873362738
parent6419fc2c770f0fbd764ead1583693e4f3c1347b4
parentfebdca29a31c765c66fffd718c5366f1290ec43b
[ARM] Merge remaining IOP code

Conflicts:
include/asm-arm/arch-at91rm9200/entry-macro.S

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/mach-iop32x/n2100.c
include/asm-arm/arch-at91/entry-macro.S
include/asm-arm/arch-imx/entry-macro.S