tree 6e318eb89da45d37ea8dceddd1ae6858b74dee1e
parent 8ce9a75a307e142a8871c649627555e0e4a1eefb
parent be716615fe596ee117292dc615e95f707fb67fd1
author Linus Torvalds <torvalds@linux-foundation.org> 1234909659 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1234909659 -0800

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

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, vm86: fix preemption bug
  x86, olpc: fix model detection without OFW
  x86, hpet: fix for LS21 + HPET = boot hang
  x86: CPA avoid repeated lazy mmu flush
  x86: warn if arch_flush_lazy_mmu_cpu is called in preemptible context
  x86/paravirt: make arch_flush_lazy_mmu/cpu disable preemption
  x86, pat: fix warn_on_once() while mapping 0-1MB range with /dev/mem
  x86/cpa: make sure cpa is safe to call in lazy mmu mode
  x86, ptrace, mm: fix double-free on race