Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  xen: update mask_rw_pte after kernel page tables init changes
  xen: set max_pfn_mapped to the last pfn mapped
  x86: Cleanup highmap after brk is concluded

Fix up trivial onflict (added header file includes) in
arch/x86/mm/init_64.c

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

diff --cc arch/x86/mm/init_64.c
index 0aa34669ed3f945400c46c737f63f5e01b6145dd,7026505a33ba20dd086f88c3b014abaf7445c722..2362b646178e4830004b1db0d147b1785be4d897
--- 1/arch/x86/mm/init_64.c
--- 2/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@@ -51,7 -51,7 +51,8 @@@
  #include <asm/numa.h>
  #include <asm/cacheflush.h>
  #include <asm/init.h>
 +#include <asm/uv/uv.h>
+ #include <asm/setup.h>
  
  static int __init parse_direct_gbpages_off(char *arg)
  {

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