tree 4e12232420fa4111937ccd079675ea495d248538
parent d3c5f8b93febadf62da9a4b39a2dca8e66a4da40
parent b1979a5fda7869a790f4fd83fb06c78498d26ba1
author Linus Torvalds <torvalds@linux-foundation.org> 1211649600 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1211649600 -0700

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

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip:
  x86: prevent PGE flush from interruption/preemption
  x86: use explicit copy in vdso_gettimeofday()
  namespacecheck: automated fixes
  x86/xen: fix arbitrary_virt_to_machine()
  x86: don't read maxlvt before checking if APIC is mapped
  x86: disable TSC for sched_clock() when calibration failed
  x86: distangle user disabled TSC from unstable
  x86: fix setup of cyc2ns in tsc_64.c