Merge branch 'ptebits' into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Thu, 9 Oct 2008 20:31:56 +0000 (21:31 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 9 Oct 2008 20:31:56 +0000 (21:31 +0100)
commit6a4690c22f5da1eb1c898b61b6a80da52fbd976f
treea03891a32abe0da191fb765fe669a597e07423c6
parent90bb28b0644f7324f8bd1feb27b35146e6785ba2
parent8ec53663d2698076468b3e1edc4e1b418bd54de3
Merge branch 'ptebits' into devel

Conflicts:

arch/arm/Kconfig
16 files changed:
arch/arm/Kconfig
arch/arm/include/asm/pgtable.h
arch/arm/lib/sha1.S
arch/arm/mach-footbridge/time.c
arch/arm/mach-ixp2000/enp2611.c
arch/arm/mach-omap2/board-2430sdp.c
arch/arm/mach-pxa/corgi.c
arch/arm/mach-pxa/spitz.c
arch/arm/mm/fault-armv.c
arch/arm/mm/ioremap.c
arch/arm/mm/mm.h
arch/arm/mm/mmu.c
arch/arm/mm/proc-v7.S
arch/arm/plat-omap/gpio.c
drivers/net/Kconfig
drivers/net/smc91x.c