Merge branches 'at91', 'ep93xx', 'kexec', 'iop', 'lmb', 'nomadik', 'nuc', 'pl', ...

diff --cc arch/arm/Kconfig
Simple merge

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

diff --cc arch/arm/kernel/entry-armv.S
Simple merge

diff --cc arch/arm/kernel/setup.c
Simple merge

diff --cc arch/arm/mach-integrator/core.c
Simple merge

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

diff --cc arch/arm/mach-realview/core.c
Simple merge

diff --cc arch/arm/mach-versatile/core.c
Simple merge

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