From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 22 Jan 2008 17:19:06 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ac935cb533b89a69e18ad175656910848ea0d79e;p=linux-beck.git

Merge git://git.kernel.org/pub/scm/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"
---

ac935cb533b89a69e18ad175656910848ea0d79e