git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3b0eb4a
3668b45
)
[ARM] Merge remaining IOP code
author
Russell King
<rmk@dyn-67.arm.linux.org.uk>
Tue, 20 Feb 2007 10:52:01 +0000
(10:52 +0000)
committer
Russell 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