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 950d3b664c1ea57eb869657e9b8d9f9761266116,e57d3b8de4b73d588abfad3fc89eae85ab641269..a17f79e0199c9ea0160ff2a987267e18fc26dd0b
--- 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 410b032faa3ba276b1fbff64d2664ae8423d959f,3170b37f82f2e4c2907e0d73fc7ab8464e70210f..bbde4a024a4848ca73014a7ddb01844f6481111c
--- 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 6dd2be7cd050c252b9dc5d2e2c097bceb00e3d9e,eb78850addaade5b09566818340e22d55a4bb606..224ce226a01bc24f5c561dd7b0680c5970803d34
--- 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 022e86842041279793ea18f9aa7fc3b1496de3b0,23ad5027d90cdf777adf1b479387980afe2b845e..4e2a087cf3889599225483bb353b29931bdc4886
--- 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 b50f87a0ee76040c0465f13fe1ff24b05674ca49,3e7e6a8f4109560e2df716474ec5375735c1824c..29bcc4dd65178a99cd640e4fc4fd715b97453e00
--- 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"