Merge nommu branch

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

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

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

diff --cc arch/arm/mm/proc-arm1026.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-arm925.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-sa1100.S
Simple merge

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

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

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