Russell King 0003cedfc5 Merge nommu tree ...

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

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

2006-03-25 22:08:55 +00:00

12 KiB

Raw Blame History

View Raw