From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 26 Jun 2015 01:22:20 +0000 (-0700)
Subject: Merge tag 'edac/v4.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab... 
X-Git-Tag: v5.15~15567
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=da996f7310eb7fa8d49223936111d3e86b72e2f3;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'edac/v4.2-1' of git://git./linux/kernel/git/mchehab/linux-edac

Pull edac updates from Mauro Carvalho Chehab:
 "Some fixes and additions to the EDAC driver used on modern Intel x86
  CPUs.  It includes support for Broadwell EP/EX platforms and fixes for
  motherboards with more than 2 CPU sockets"

* tag 'edac/v4.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac:
  sb_edac: support for Broadwell -EP and -EX
  sb_edac: Fix support for systems with two home agents per socket
  sb_edac: Fix a typo and a thinko in address handling for Haswell
  EDAC: Remove arbitrary limit on number of channels
---

da996f7310eb7fa8d49223936111d3e86b72e2f3