From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 7 Apr 2008 20:14:37 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux... 
X-Git-Tag: v2.6.25-rc9~51
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=950b0d28378c4ee63a30dad732a8319c8a41c95d;p=linux-2.6-omap-h63xx.git

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"
---

950b0d28378c4ee63a30dad732a8319c8a41c95d