diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-22 09:19:06 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-22 09:19:06 -0800 |
| commit | ac935cb533b89a69e18ad175656910848ea0d79e (patch) | |
| tree | bad12eb200f30f0838de8616605b01f73c683ffa /sound/oss | |
| parent | b2214fca2bf7db492cd508769da7ca703a7f1806 (diff) | |
| parent | 4960c9df1407c2723459c60ff13e6efe0c209c62 (diff) | |
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 'sound/oss')
0 files changed, 0 insertions, 0 deletions