From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 6 Jun 2016 16:55:31 +0000 (-0700)
Subject: Merge tag 'edac_fixes_for_4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
X-Git-Tag: v4.9.8~1930
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3613a6245b9fb5091724961e502fd1228de40f32;p=platform%2Fkernel%2Flinux-rpi3.git

Merge tag 'edac_fixes_for_4.7' of git://git./linux/kernel/git/bp/bp

Pull EDAC fixes from Borislav Petkov:
 "EDAC fixes to recent fallout from workqueue cleanup and Broadwell
  enablement:

   - sb_edac fallout fixes from recent Broadwell enablement (Tony Luck)

   - EDAC workqueue poll period resetting fix (Nicholas Krause)"

* tag 'edac_fixes_for_4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
  EDAC, sb_edac: Readd accidentally dropped Broadwell-D support
  EDAC: Fix workqueues poll period resetting
  EDAC, sb_edac: Fix rank lookup on Broadwell
---

3613a6245b9fb5091724961e502fd1228de40f32