projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 98f20fb da54bec)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 4 Dec 2007 17:28:45 +0000 (09:28 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 4 Dec 2007 17:28:45 +0000 (09:28 -0800)
* 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


Trivial merge
John Crispins staging tree