Merge branch 'ptebits' into devel

Conflicts:

	arch/arm/Kconfig

diff --cc arch/arm/Kconfig
index ea52fae,70dba16..744d07e
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -843,9 -810,19 +843,14 @@@ config OABI_COMPA
          UNPREDICTABLE (in fact it can be predicted that it won't work
          at all). If in doubt say Y.
  
+ config ARCH_FLATMEM_HAS_HOLES
+       bool
+       default y
+       depends on FLATMEM
+ 
 +# Discontigmem is deprecated
  config ARCH_DISCONTIGMEM_ENABLE
        bool
 -      default (ARCH_LH7A40X && !LH7A40X_CONTIGMEM)
 -      help
 -        Say Y to support efficient handling of discontiguous physical memory,
 -        for architectures which are either NUMA (Non-Uniform Memory Access)
 -        or have huge holes in the physical address space for other reasons.
 -        See <file:Documentation/vm/numa> for more.
  
  config ARCH_SPARSEMEM_ENABLE
        bool

diff --cc arch/arm/include/asm/pgtable.h
Simple merge

diff --cc arch/arm/lib/sha1.S
Simple merge

diff --cc arch/arm/mach-footbridge/time.c
Simple merge

diff --cc arch/arm/mach-ixp2000/enp2611.c
Simple merge

diff --cc arch/arm/mach-omap2/board-2430sdp.c
Simple merge

diff --cc arch/arm/mach-pxa/corgi.c
Simple merge

diff --cc arch/arm/mach-pxa/spitz.c
Simple merge

diff --cc arch/arm/mm/fault-armv.c
Simple merge

diff --cc arch/arm/mm/ioremap.c
Simple merge

diff --cc arch/arm/mm/mm.h
Simple merge

diff --cc arch/arm/mm/mmu.c
Simple merge

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

diff --cc arch/arm/plat-omap/gpio.c
Simple merge

diff --cc drivers/net/Kconfig
Simple merge

diff --cc drivers/net/smc91x.c
Simple merge