tree 3a2e467b04b7e66c9ef233e8c8b286278ef79adf
parent d9a73c00161f3eaa4c8c035c62f45afd1549e38a
parent 3709c857350976408953831f0cf89d19951394a1
author Linus Torvalds <torvalds@linux-foundation.org> 1281115072 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1281115072 -0700

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: Ioremap: fix wrong physical address handling in PAT code
  x86, tlb: Clean up and correct used type
  x86, iomap: Fix wrong page aligned size calculation in ioremapping code
  x86, mm: Create symbolic index into address_markers array
  x86, ioremap: Fix normal ram range check
  x86, ioremap: Fix incorrect physical address handling in PAE mode
  x86-64, mm: Initialize VDSO earlier on 64 bits
  x86, kmmio/mmiotrace: Fix double free of kmmio_fault_pages