Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 22 Jan 2008 17:19:06 +0000 (09:19 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 22 Jan 2008 17:19:06 +0000 (09:19 -0800)
commitac935cb533b89a69e18ad175656910848ea0d79e
treebad12eb200f30f0838de8616605b01f73c683ffa
parentb2214fca2bf7db492cd508769da7ca703a7f1806
parent4960c9df1407c2723459c60ff13e6efe0c209c62
Merge git://git./linux/kernel/git/x86/linux-2.6-x86

* git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86:
  Revert "x86: fix NMI watchdog & 'stopped time' problem"