From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 19 Feb 2015 19:18:14 +0000 (-0800)
Subject: Merge tag 'edac_fixes_for_3.20' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: firefly_0821_release~176^2~2274
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=477ea1169667a88d8ee12d83a0b0863091fb8670;p=firefly-linux-kernel-4.4.55.git

Merge tag 'edac_fixes_for_3.20' of git://git./linux/kernel/git/bp/bp

Pull two EDAC fixes from Borislav Petkov:

 - A fix to sb_edac for proper detection on SNB machines

 - A fix to amd64_edac to not explode on Numascale machines with more
   than 16 memory controllers, from Daniel J Blueman.

* tag 'edac_fixes_for_3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
  EDAC, amd64_edac: Prevent OOPS with >16 memory controllers
  sb_edac: Fix detection on SNB machines
---

477ea1169667a88d8ee12d83a0b0863091fb8670