commit | 4e1db5e58af8bc6ab4a651df279add41c48d3fc2 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jan 06 11:05:21 2011 -0800 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jan 06 11:05:21 2011 -0800 |
tree | 3288c8411334b47daabc4688df9e5c4e0ba825b6 | |
parent | 37d9a8c5ea8fc063841c133fc53cc168ee620762 [diff] | |
parent | eb48c9cb2053e7bb5f7f8f0371cb578a0d439450 [diff] |
Merge branch 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: apic, amd: Make firmware bug messages more meaningful mce, amd: Remove goto in threshold_create_device() mce, amd: Add helper functions to setup APIC mce, amd: Shorten local variables mci_misc_{hi,lo} mce, amd: Implement mce_threshold_block_init() helper function