Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 3 Mar 2010 17:11:02 +0000 (09:11 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 3 Mar 2010 17:11:02 +0000 (09:11 -0800)
commit2a32f2db132264c356aea30a8270d3e68d96c509
treef98f0e1b9d85c7964b8fc149f451ae77072c3c27
parentfeaf77d51a6e2e95f60c8095ac7282e610ede798
parentf41496607e03ab99f263b8e26689ad0fc853007f
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
arch/x86/include/asm/pgtable_32.h
kernel/resource.c