From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 3 Mar 2010 17:11:02 +0000 (-0800)
Subject: Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.34-rc1~212
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2a32f2db132264c356aea30a8270d3e68d96c509;p=platform%2Fkernel%2Flinux-3.10.git

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

* 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  resource: Fix broken indentation
  resource: Fix generic page_is_ram() for partial RAM pages
  x86, paravirt: Remove kmap_atomic_pte paravirt op.
  x86, vmi: Disable highmem PTE allocation even when CONFIG_HIGHPTE=y
  x86, xen: Disable highmem PTE allocation even when CONFIG_HIGHPTE=y
---

2a32f2db132264c356aea30a8270d3e68d96c509