tree feee65cf5a52fb2be7d2dc48a412b0f3a8b93a05
parent 98f20fb6a9b1db4ef6ab19e5eb0e41f04d38b4aa
parent da54becc7166b5fad70538acea5e93bdd83dd8a6
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1196789325 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1196789325 -0800

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:
  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