Fix merge conflict in arch/arm/mm/proc-xscale.S
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>