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>

diff --cc arch/microblaze/mm/init.c
Simple merge

diff --cc arch/powerpc/kernel/paca.c
Simple merge

diff --cc arch/powerpc/kernel/rtas.c
Simple merge

diff --cc arch/powerpc/kernel/setup_32.c
Simple merge

diff --cc arch/powerpc/kernel/setup_64.c
Simple merge

diff --cc arch/powerpc/mm/fsl_booke_mmu.c
Simple merge

diff --cc arch/powerpc/mm/init_64.c
Simple merge

diff --cc arch/powerpc/mm/numa.c
Simple merge

diff --cc arch/powerpc/mm/tlb_nohash.c
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/kernel/acpi/sleep.c
Simple merge

diff --cc arch/x86/kernel/head32.c
Simple merge

diff --cc arch/x86/kernel/mpparse.c
Simple merge

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

diff --cc arch/x86/kernel/trampoline.c
index 7c2102c,a874495..9a3d44c
--- 1/arch/x86/kernel/trampoline.c
--- 2/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/e820.h>
+ #include <asm/pgtable.h>
  
  #if defined(CONFIG_X86_64) && defined(CONFIG_ACPI_SLEEP)
  #define __trampinit

diff --cc arch/x86/mm/init_64.c
Simple merge

diff --cc arch/x86/xen/mmu.c
index b511f19,42086ac..4fe04ac
--- 1/arch/x86/xen/mmu.c
--- 2/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>

diff --cc arch/x86/xen/setup.c
Simple merge

diff --cc include/linux/mm.h
Simple merge

diff --cc kernel/Makefile
Simple merge

diff --cc mm/page_alloc.c
Simple merge