tree e7e8a41ac5b11b650180a84c92f517d15907a9ba
parent 2557a933b795c1988c721ebb871cd735128bb9cb
parent 871de939030c903fd5ed50a7c4c88e02998e1cbc
author Linus Torvalds <torvalds@linux-foundation.org> 1207599277 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1207599277 -0700

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86:
  x86: fix 64-bit asm NOPS for CONFIG_GENERIC_CPU
  x86: fix call to set_cyc2ns_scale() from time_cpufreq_notifier()
  revert "x86: tsc prevent time going backwards"