arch/arm/mm/proc-arm1020.S · 3b93e7b08fc3e87e5b451ee5e47cfe142779d0cd · jan.koester / Linux

Mar 25, 2006

Russell King authored Mar 25, 2006



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

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

0003cedf

Russell King authored Mar 25, 2006



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

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