From: Linus Torvalds Date: Thu, 6 Jan 2011 19:05:21 +0000 (-0800) Subject: Merge branch 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: v2.6.38-rc1~484 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4e1db5e58af8bc6ab4a651df279add41c48d3fc2;p=platform%2Fkernel%2Flinux-exynos.git Merge branch 'x86-mce-for-linus' of git://git./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 --- 4e1db5e58af8bc6ab4a651df279add41c48d3fc2