From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 28 Feb 2010 18:38:45 +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~255
X-Git-Url: http://git.cascardo.info/?a=commitdiff_plain;h=46bbffad54bd48bb809f2691c1970a79a588976b;p=cascardo%2Flinux.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:
  x86, mm: Unify kernel_physical_mapping_init() API
  x86, mm: Allow highmem user page tables to be disabled at boot time
  x86: Do not reserve brk for DMI if it's not going to be used
  x86: Convert tlbstate_lock to raw_spinlock
  x86: Use the generic page_is_ram()
  x86: Remove BIOS data range from e820
  Move page_is_ram() declaration to mm.h
  Generic page_is_ram: use __weak
  resources: introduce generic page_is_ram()
---

46bbffad54bd48bb809f2691c1970a79a588976b