From: Linus Torvalds Date: Tue, 16 May 2017 16:18:18 +0000 (-0700) Subject: Merge tag 'edac_fix_for_4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp X-Git-Tag: v4.14-rc1~893 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bec6cd63aa0abb0752e3d04daa36e26c08a49315;p=platform%2Fkernel%2Flinux-rpi.git Merge tag 'edac_fix_for_4.12' of git://git./linux/kernel/git/bp/bp Pull EDAC fix from Borislav Petkov: "A single amd64_edac fix correcting chip select sizes reporting on F17h" * tag 'edac_fix_for_4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp: EDAC, amd64: Fix reporting of Chip Select sizes on Fam17h --- bec6cd63aa0abb0752e3d04daa36e26c08a49315