Merge commit 'v2.6.36-rc3' into x86/memblock
Ingo Molnar [Tue, 31 Aug 2010 07:45:21 +0000 (09:45 +0200)]
Conflicts:
arch/x86/kernel/trampoline.c
mm/memblock.c

Merge reason: Resolve the conflicts, update to latest upstream.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

21 files changed:
1  2 
arch/microblaze/mm/init.c
arch/powerpc/kernel/paca.c
arch/powerpc/kernel/rtas.c
arch/powerpc/kernel/setup_32.c
arch/powerpc/kernel/setup_64.c
arch/powerpc/mm/fsl_booke_mmu.c
arch/powerpc/mm/init_64.c
arch/powerpc/mm/numa.c
arch/powerpc/mm/tlb_nohash.c
arch/x86/Kconfig
arch/x86/kernel/acpi/sleep.c
arch/x86/kernel/head32.c
arch/x86/kernel/mpparse.c
arch/x86/kernel/setup.c
arch/x86/kernel/trampoline.c
arch/x86/mm/init_64.c
arch/x86/xen/mmu.c
arch/x86/xen/setup.c
include/linux/mm.h
kernel/Makefile
mm/page_alloc.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -1,7 -1,8 +1,8 @@@
  #include <linux/io.h>
 +#include <linux/memblock.h>
  
  #include <asm/trampoline.h>
+ #include <asm/pgtable.h>
 -#include <asm/e820.h>
  
  #if defined(CONFIG_X86_64) && defined(CONFIG_ACPI_SLEEP)
  #define __trampinit
Simple merge
  #include <linux/highmem.h>
  #include <linux/debugfs.h>
  #include <linux/bug.h>
+ #include <linux/vmalloc.h>
  #include <linux/module.h>
  #include <linux/gfp.h>
 +#include <linux/memblock.h>
  
  #include <asm/pgtable.h>
  #include <asm/tlbflush.h>
Simple merge
Simple merge
diff --cc kernel/Makefile
Simple merge
diff --cc mm/page_alloc.c
Simple merge