Skip to content
Commit 0003cedf authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge nommu tree 



Fix merge conflict in arch/arm/mm/proc-xscale.S

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parents 3ee357f0 c76b6b41
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment