From: Linus Torvalds Date: Tue, 30 Apr 2013 15:42:45 +0000 (-0700) Subject: Merge branch 'x86-ras-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: omap-for-v3.10/dt-fixes-for-merge-window~107 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a5a1bf099d6942399ea0b34a62e5f0bc4c5c36e;p=pandora-kernel.git Merge branch 'x86-ras-for-linus' of git://git./linux/kernel/git/tip/tip Pull x86 RAS changes from Ingo Molnar: - Add an Intel CMCI hotplug fix - Add AMD family 16h EDAC support - Make the AMD MCE banks code more flexible for virtual environments * 'x86-ras-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: amd64_edac: Add Family 16h support x86/mce: Rework cmci_rediscover() to play well with CPU hotplug x86, MCE, AMD: Use MCG_CAP MSR to find out number of banks on AMD x86, MCE, AMD: Replace shared_bank array with is_shared_bank() helper --- 5a5a1bf099d6942399ea0b34a62e5f0bc4c5c36e Reading git-diff-tree failed