Fix up auto merge problems.
authorRussell King <rmk@flint.arm.linux.org.uk>
Sun, 10 Mar 2002 17:32:23 +0000 (17:32 +0000)
committerRussell King <rmk@flint.arm.linux.org.uk>
Sun, 10 Mar 2002 17:32:23 +0000 (17:32 +0000)
commita77eaedab4fa665d6041e4adebd217ec3cb3c3e8
tree845e2f0c50daeb7e9347a41ffcec1bc26fe4b6c3
parentbc9d1c71168435f6acba6e42bcc0283fdcd62f86
parent5a8202f0259a71a27d69a348eb8c7e31b8dd3a2f
Fix up auto merge problems.
arch/arm/mm/proc-arm1020.S
arch/arm/mm/proc-arm6,7.S
arch/arm/mm/proc-arm720.S
arch/arm/mm/proc-arm920.S
arch/arm/mm/proc-arm922.S
arch/arm/mm/proc-arm926.S
arch/arm/mm/proc-sa110.S
arch/arm/mm/proc-xscale.S
include/asm-arm/page.h