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:
  x86: arch_register_cpu() section fix
  x86: free_cache_attributes() section fix
  x86: add the word 'WARNING' in check_nmi_watchdog() output
  x86: revert CONFIG_X86_HT semantics change

...

This commit is contained in:

Linus Torvalds 2007-12-04 09:28:45 -08:00

parent 98f20fb6a9 da54becc71

commit a3aaabd6b4

5 changed files with 10 additions and 6 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

3

arch/x86/Kconfig

View file

2

arch/x86/kernel/cpu/intel_cacheinfo.c

View file

3

arch/x86/kernel/nmi_32.c

View file

3

arch/x86/kernel/nmi_64.c

View file

5

arch/x86/kernel/topology.c

View file