Merge commit 'v2.6.30-rc5' into x86/mm

Merge reason: this branch was on a .30-rc2 base - sync it up with
              all the latest fixes.

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

diff --cc arch/x86/mm/init.c
index 4d67c33a2e165c993870411cae5d4cdcefc5e72c,ae4f7b5d71040566f7b30af16e6c00f20c82c098..95f5ecf2be5020dbcc57773b25b913ae0deb7a15
--- 1/arch/x86/mm/init.c
--- 2/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@@ -7,11 -7,9 +7,12 @@@
  #include <asm/page.h>
  #include <asm/page_types.h>
  #include <asm/sections.h>
+ #include <asm/setup.h>
  #include <asm/system.h>
  #include <asm/tlbflush.h>
 +#include <asm/tlb.h>
 +
 +DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
  
  unsigned long __initdata e820_table_start;
  unsigned long __meminitdata e820_table_end;