aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2008-01-22 09:19:06 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-01-22 09:19:06 -0800
commitac935cb533b89a69e18ad175656910848ea0d79e (patch)
treebad12eb200f30f0838de8616605b01f73c683ffa /drivers
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched (diff)
parentRevert "x86: fix NMI watchdog & 'stopped time' problem" (diff)
downloadlinux-dev-ac935cb533b89a69e18ad175656910848ea0d79e.tar.xz
linux-dev-ac935cb533b89a69e18ad175656910848ea0d79e.zip
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"
Diffstat (limited to 'drivers')
0 files changed, 0 insertions, 0 deletions