From: Linus Torvalds Date: Sat, 23 Jul 2011 00:03:40 +0000 (-0700) Subject: Merge branch 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: firefly_0821_release~3680^2~4981 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7c6582b28a7debef031a8b7e31953c7d45ddb05d;p=firefly-linux-kernel-4.4.55.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: x86, mce: Use mce_sysdev_ prefix to group functions x86, mce: Use mce_chrdev_ prefix to group functions x86, mce: Cleanup mce_read() x86, mce: Cleanup mce_create()/remove_device() x86, mce: Check the result of ancient_init() x86, mce: Introduce mce_gather_info() x86, mce: Replace MCM_ with MCI_MISC_ x86, mce: Replace MCE_SELF_VECTOR by irq_work x86, mce, severity: Clean up trivial coding style problems x86, mce, severity: Cleanup severity table x86, mce, severity: Make formatting a bit more readable x86, mce, severity: Fix two severities table signatures --- 7c6582b28a7debef031a8b7e31953c7d45ddb05d