Merge branches 'btc', 'dma', 'entry', 'fixes', 'linker-layout', 'misc', 'mmci', ...

diff --cc arch/arm/boot/compressed/head.S
Simple merge

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

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

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

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

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

diff --cc arch/arm/mm/init.c
index c19571c40a21ca62902d65cd01dcb8db9ea4f178,17d6cd0c57ed114e8d7c78e8daf60360f3cd9fa4,c19571c40a21ca62902d65cd01dcb8db9ea4f178,c19571c40a21ca62902d65cd01dcb8db9ea4f178,b8e8912431532cf73ed5fd8adff727c6f7e76275,fdc87f9bda55751f19336cf4423618b40d15e400,c19571c40a21ca62902d65cd01dcb8db9ea4f178,c19571c40a21ca62902d65cd01dcb8db9ea4f178,c19571c40a21ca62902d65cd01dcb8db9ea4f178..e5ab4362322fcf2cdef2b598e9425579e28690ef
--- 1/arch/arm/mm/init.c
--- 2/arch/arm/mm/init.c
--- 3/arch/arm/mm/init.c
--- 4/arch/arm/mm/init.c
--- 5/arch/arm/mm/init.c
--- 6/arch/arm/mm/init.c
--- 7/arch/arm/mm/init.c
--- 8/arch/arm/mm/init.c
--- 9/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@@@@@@@@@ -639,10 -649,10 -639,10 -639,10 -639,10 -644,9 -639,10 -639,10 -639,10 +660,10 @@@@@@@@@@ void __init mem_init(void
                                "    pkmap   : 0x%08lx - 0x%08lx   (%4ld MB)\n"
         #endif
                                "    modules : 0x%08lx - 0x%08lx   (%4ld MB)\n"
---- ----                       "      .init : 0x%p" " - 0x%p" "   (%4d kB)\n"
                                "      .text : 0x%p" " - 0x%p" "   (%4d kB)\n"
     -                          "      .data : 0x%p" " - 0x%p" "   (%4d kB)\n",
++++ ++++                       "      .init : 0x%p" " - 0x%p" "   (%4d kB)\n"
     +                          "      .data : 0x%p" " - 0x%p" "   (%4d kB)\n"
     +                          "       .bss : 0x%p" " - 0x%p" "   (%4d kB)\n",
         
                                MLK(UL(CONFIG_VECTORS_BASE), UL(CONFIG_VECTORS_BASE) +
                                        (PAGE_SIZE)),
@@@@@@@@@@ -662,10 -672,10 -662,10 -662,10 -662,10 -666,9 -662,10 -662,10 -662,10 +683,10 @@@@@@@@@@
         #endif
                                MLM(MODULES_VADDR, MODULES_END),
         
---- ----                       MLK_ROUNDUP(__init_begin, __init_end),
                                MLK_ROUNDUP(_text, _etext),
     -                          MLK_ROUNDUP(_sdata, _edata));
++++ ++++                       MLK_ROUNDUP(__init_begin, __init_end),
     +                          MLK_ROUNDUP(_sdata, _edata),
     +                          MLK_ROUNDUP(__bss_start, __bss_stop));
         
         #undef MLK
         #undef MLM

diff --cc drivers/mmc/host/mmci.c
Simple merge