From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 4 Dec 2007 17:28:45 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
X-Git-Tag: v2.6.24-rc5~112
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a3aaabd6b402d8b0ede5aa4a040e9fdbbfdf9116;p=linux-2.6

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

a3aaabd6b402d8b0ede5aa4a040e9fdbbfdf9116