Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86

Browse source

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

...

This commit is contained in:

Linus Torvalds 2008-01-22 09:19:06 -08:00

parent b2214fca2b 4960c9df14

commit ac935cb533

2 changed files with 4 additions and 17 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

12

arch/x86/kernel/io_apic_32.c

View file

9

arch/x86/kernel/nmi_32.c

View file