mirror of
https://github.com/FEX-Emu/linux.git
synced 2025-02-06 19:39:48 +00:00
0003cedfc5
Fix merge conflict in arch/arm/mm/proc-xscale.S Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>