From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 31 Aug 2010 07:45:21 +0000 (+0200)
Subject: Merge commit 'v2.6.36-rc3' into x86/memblock
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=daab7fc734a53fdeaf844b7c03053118ad1769da;p=linux-edison.git

Merge commit 'v2.6.36-rc3' into x86/memblock

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>
---

daab7fc734a53fdeaf844b7c03053118ad1769da
diff --cc arch/x86/kernel/trampoline.c
index 7c2102c2aad,a874495b367..9a3d44c0df9
--- a/arch/x86/kernel/trampoline.c
+++ b/arch/x86/kernel/trampoline.c
@@@ -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
diff --cc arch/x86/xen/mmu.c
index b511f198691,42086ac406a..4fe04ac0bae
--- a/arch/x86/xen/mmu.c
+++ b/arch/x86/xen/mmu.c
@@@ -42,9 -42,9 +42,10 @@@
  #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>