tree 088102ff69846c71c963e970a90d627498202928
parent b9a0d06a35c382c02f471a0815e2e27cdfe1c7f9
parent 58dab916dfb57328d50deb0aa9b3fc92efa248ff
author Linus Torvalds <torvalds@linux-foundation.org> 1231887196 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1231887196 -0800

Merge branch 'x86-pat-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-pat-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86 PAT: remove CPA WARN_ON for zero pte
  x86 PAT: return compatible mapping to remap_pfn_range callers
  x86 PAT: change track_pfn_vma_new to take pgprot_t pointer param
  x86 PAT: consolidate old memtype new memtype check into a function
  x86 PAT: remove PFNMAP type on track_pfn_vma_new() error