From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Fri, 22 Jul 2011 22:08:48 +0000 (+0100)
Subject: Merge branches 'btc', 'dma', 'entry', 'fixes', 'linker-layout', 'misc', 'mmci', ... 
X-Git-Tag: v3.1-rc1~258^2~1
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=06f365acef5ca54fd5708a0d853c4a89609536f1

Merge branches 'btc', 'dma', 'entry', 'fixes', 'linker-layout', 'misc', 'mmci', 'suspend' and 'vfp' into for-next
---

06f365acef5ca54fd5708a0d853c4a89609536f1
diff --cc arch/arm/mm/init.c
index c19571c40a21,17d6cd0c57ed,c19571c40a21,c19571c40a21,b8e891243153,fdc87f9bda55,c19571c40a21,c19571c40a21,c19571c40a21..e5ab4362322f
--- a/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