Merge branches 'consolidate', 'ep93xx', 'fixes', 'misc', 'mmci', 'remove' and 'spear...

diff --cc arch/arm/Kconfig
index 9dd6101,377a7a5,96839d9,7fd33a3,377a7a5,0c23b52,93d595a..4344930
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
--- 3/arch/arm/Kconfig
--- 4/arch/arm/Kconfig
--- 5/arch/arm/Kconfig
--- 6/arch/arm/Kconfig
--- 7/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@@@@@@ -367,8 -366,7 -366,7 -372,7 -366,7 -366,7 -365,6 +373,8 @@@@@@@@ config ARCH_MX
        select GENERIC_CLOCKEVENTS
        select ARCH_REQUIRE_GPIOLIB
        select CLKDEV_LOOKUP
 ++++++ select CLKSRC_MMIO
      + select HAVE_SCHED_CLOCK
        help
          Support for Freescale MXC/iMX-based family of processors
       
@@@@@@@@ -2013,9 -2010,9 -2010,9 -2030,9 -2010,9 -1996,9 -2009,6 +2019,9 @@@@@@@@ menu "Power management options
       source "kernel/power/Kconfig"
       
       config ARCH_SUSPEND_POSSIBLE
-- ---  depends on !ARCH_S5P64X0 && !ARCH_S5P6442
++ ++++ depends on !ARCH_S5P64X0 && !ARCH_S5P6442 && !ARCH_S5PC100
      + depends on CPU_ARM920T || CPU_ARM926T || CPU_SA1100 || \
      +         CPU_V6 || CPU_V6K || CPU_V7 || CPU_XSC3 || CPU_XSCALE
        def_bool y
       
       endmenu

diff --cc arch/arm/Makefile
Simple merge

diff --cc arch/arm/boot/compressed/head.S
index 49f5b2e,adf583c,49f5b2e,ae7ecc2,adf583c,adf583c,84ac4d6..6fdf4ab
--- 1/arch/arm/boot/compressed/head.S
--- 2/arch/arm/boot/compressed/head.S
--- 3/arch/arm/boot/compressed/head.S
--- 4/arch/arm/boot/compressed/head.S
--- 5/arch/arm/boot/compressed/head.S
--- 6/arch/arm/boot/compressed/head.S
--- 7/arch/arm/boot/compressed/head.S
+++ b/arch/arm/boot/compressed/head.S
@@@@@@@@ -664,7 -652,7 -664,7 -662,13 -652,7 -652,7 -660,7 +674,13 @@@@@@@@ proc_types
                W(b)    __armv4_mpu_cache_on
                W(b)    __armv4_mpu_cache_off
                W(b)    __armv4_mpu_cache_flush
+ +    
+++ +++         .word   0x41069260              @ ARM926EJ-S (v5TEJ)
+++ +++         .word   0xff0ffff0
+++ +++         b       __arm926ejs_mmu_cache_on
+++ +++         b       __armv4_mmu_cache_off
+++ +++         b       __armv5tej_mmu_cache_flush
 +  +++
                .word   0x00007000              @ ARM7 IDs
                .word   0x0000f000
                mov     pc, lr

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

diff --cc arch/arm/plat-spear/include/plat/clock.h
Simple merge