Merge branch 'misc' into devel

Conflicts:
	arch/arm/mm/init.c

diff --cc arch/arm/Kconfig
Simple merge

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

diff --cc arch/arm/kernel/machine_kexec.c
index 81e9898,df5958f..1fc74cb
--- 1/arch/arm/kernel/machine_kexec.c
--- 2/arch/arm/kernel/machine_kexec.c
+++ b/arch/arm/kernel/machine_kexec.c
@@@ -37,16 -37,8 +37,12 @@@ void machine_kexec_cleanup(struct kimag
  {
  }
  
- void machine_shutdown(void)
- {
- }
- 
  void machine_crash_shutdown(struct pt_regs *regs)
  {
 +      local_irq_disable();
 +      crash_save_cpu(regs, smp_processor_id());
 +
 +      printk(KERN_INFO "Loading crashdump kernel...\n");
  }
  
  void machine_kexec(struct kimage *image)

diff --cc arch/arm/mach-ixp4xx/common-pci.c
Simple merge

diff --cc arch/arm/mm/init.c
index 599d121,e00404e..240b68d
--- 1/arch/arm/mm/init.c
--- 2/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@@ -431,14 -528,26 +431,19 @@@ static void __init free_unused_memmap(s
  void __init mem_init(void)
  {
        unsigned long reserved_pages, free_pages;
 -      int i, node;
 +      int i;
+ #ifdef CONFIG_HAVE_TCM
+       /* These pointers are filled in on TCM detection */
+       extern u32 dtcm_end;
+       extern u32 itcm_end;
+ #endif
  
 -#ifndef CONFIG_DISCONTIGMEM
        max_mapnr   = pfn_to_page(max_pfn + PHYS_PFN_OFFSET) - mem_map;
 -#endif
  
        /* this will put all unused low memory onto the freelists */
 -      for_each_online_node(node) {
 -              pg_data_t *pgdat = NODE_DATA(node);
 -
 -              free_unused_memmap_node(node, &meminfo);
 +      free_unused_memmap(&meminfo);
  
 -              if (pgdat->node_spanned_pages != 0)
 -                      totalram_pages += free_all_bootmem_node(pgdat);
 -      }
 +      totalram_pages += free_all_bootmem();
  
  #ifdef CONFIG_SA1111
        /* now that our DMA memory is actually so designated, we can free it */

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