Fix merge conflict in arch/arm/mm/proc-xscale.S Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Attach a file by drag & drop or click to upload
Russell King <rmk+kernel@arm.linux.org.uk>
0003cedf
Russell King <rmk+kernel@arm.linux.org.uk>