projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commita3aaabd6b402d8b0ede5aa4a040e9fdbbfdf9116
treefeee65cf5a52fb2be7d2dc48a412b0f3a8b93a05tree | snapshot
parent98f20fb6a9b1db4ef6ab19e5eb0e41f04d38b4aacommit | diff
parentda54becc7166b5fad70538acea5e93bdd83dd8a6commit | diff
Merge git://git./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
John Crispins staging tree