tree 21779a574f118b1cba5d6832bc0a0fa3bee97075
parent 85fe20bfd415af0a2e93bd1166533d4a6eb591ea
parent c1fd1b43831fa20c91cdd461342af8edf2e87c2f
author Linus Torvalds <torvalds@linux-foundation.org> 1267382325 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1267382325 -0800

Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/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()