Merge nommu tree

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

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

diff --cc arch/arm/kernel/head.S
Simple merge

diff --cc arch/arm/mm/Kconfig
Simple merge

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-arm720.S
Simple merge

diff --cc arch/arm/mm/proc-arm920.S
index 950d3b6,e57d3b8..a17f79e
--- 1/arch/arm/mm/proc-arm920.S
--- 2/arch/arm/mm/proc-arm920.S
+++ b/arch/arm/mm/proc-arm920.S
@@@ -28,8 -28,10 +28,9 @@@
  #include <linux/config.h>
  #include <linux/init.h>
  #include <asm/assembler.h>
+ #include <asm/pgtable-hwdef.h>
  #include <asm/pgtable.h>
  #include <asm/procinfo.h>
 -#include <asm/hardware.h>
  #include <asm/page.h>
  #include <asm/ptrace.h>
  #include "proc-macros.S"

diff --cc arch/arm/mm/proc-arm922.S
index 410b032,3170b37..bbde4a0
--- 1/arch/arm/mm/proc-arm922.S
--- 2/arch/arm/mm/proc-arm922.S
+++ b/arch/arm/mm/proc-arm922.S
@@@ -29,8 -29,10 +29,9 @@@
  #include <linux/config.h>
  #include <linux/init.h>
  #include <asm/assembler.h>
+ #include <asm/pgtable-hwdef.h>
  #include <asm/pgtable.h>
  #include <asm/procinfo.h>
 -#include <asm/hardware.h>
  #include <asm/page.h>
  #include <asm/ptrace.h>
  #include "proc-macros.S"

diff --cc arch/arm/mm/proc-arm925.S
index 6dd2be7,eb78850..224ce22
--- 1/arch/arm/mm/proc-arm925.S
--- 2/arch/arm/mm/proc-arm925.S
+++ b/arch/arm/mm/proc-arm925.S
@@@ -51,8 -51,10 +51,9 @@@
  #include <linux/config.h>
  #include <linux/init.h>
  #include <asm/assembler.h>
+ #include <asm/pgtable-hwdef.h>
  #include <asm/pgtable.h>
  #include <asm/procinfo.h>
 -#include <asm/hardware.h>
  #include <asm/page.h>
  #include <asm/ptrace.h>
  #include "proc-macros.S"

diff --cc arch/arm/mm/proc-arm926.S
index 022e868,23ad502..4e2a087
--- 1/arch/arm/mm/proc-arm926.S
--- 2/arch/arm/mm/proc-arm926.S
+++ b/arch/arm/mm/proc-arm926.S
@@@ -28,8 -28,10 +28,9 @@@
  #include <linux/config.h>
  #include <linux/init.h>
  #include <asm/assembler.h>
+ #include <asm/pgtable-hwdef.h>
  #include <asm/pgtable.h>
  #include <asm/procinfo.h>
 -#include <asm/hardware.h>
  #include <asm/page.h>
  #include <asm/ptrace.h>
  #include "proc-macros.S"

diff --cc arch/arm/mm/proc-xscale.S
index b50f87a,3e7e6a8..29bcc4d
--- 1/arch/arm/mm/proc-xscale.S
--- 2/arch/arm/mm/proc-xscale.S
+++ b/arch/arm/mm/proc-xscale.S
@@@ -24,7 -24,9 +24,8 @@@
  #include <linux/init.h>
  #include <asm/assembler.h>
  #include <asm/procinfo.h>
 -#include <asm/hardware.h>
 -#include <asm/pgtable-hwdef.h>
  #include <asm/pgtable.h>
++#include <asm/pgtable-hwdef.h>
  #include <asm/page.h>
  #include <asm/ptrace.h>
  #include "proc-macros.S"