git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3ee357f
c76b6b4
)
Merge nommu tree
author
Russell King
<rmk@dyn-67.arm.linux.org.uk>
Sat, 25 Mar 2006 22:08:55 +0000
(22:08 +0000)
committer
Russell King
<rmk+kernel@arm.linux.org.uk>
Sat, 25 Mar 2006 22:08:55 +0000
(22:08 +0000)
Fix merge conflict in arch/arm/mm/proc-xscale.S
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff