From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 22 Mar 2011 17:41:36 +0000 (-0700)
Subject: Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.39-rc1~385
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=73d5a8675f32b8e22e11773b314324316f920192;p=pandora-kernel.git

Merge branch 'x86-fixes-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

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

73d5a8675f32b8e22e11773b314324316f920192
diff --cc arch/x86/mm/init_64.c
index 0aa34669ed3f,7026505a33ba..2362b646178e
--- a/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)
  {