Fix up auto merge problems.

diff --cc arch/arm/mm/proc-arm1020.S
Simple merge

diff --cc arch/arm/mm/proc-arm6,7.S
Simple merge

diff --cc arch/arm/mm/proc-arm720.S
Simple merge

diff --cc arch/arm/mm/proc-arm920.S
Simple merge

diff --cc arch/arm/mm/proc-arm922.S
Simple merge

diff --cc arch/arm/mm/proc-arm926.S
Simple merge

diff --cc arch/arm/mm/proc-sa110.S
Simple merge

diff --cc arch/arm/mm/proc-xscale.S
Simple merge

diff --cc include/asm-arm/page.h
Simple merge