From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 11 Dec 2014 19:58:50 +0000 (-0800)
Subject: Merge tag 'edac/v3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab... 
X-Git-Tag: v4.14-rc1~6342
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=709d9f09b6aee5828cb8f168f63030608176cd0e;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'edac/v3.19-rc1' of git://git./linux/kernel/git/mchehab/linux-edac

Pull edac updates from Mauro Carvalho Chehab:
 - Broadwell-DE support on sb-edac driver
 - Some fixes at sb-edac driver

* tag 'edac/v3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac:
  sb_edac: Fix typo computing number of banks
  sb_edac: Add support for Broadwell-DE processor
  sb_edac: Fix discovery of top-of-low-memory for Haswell
  sb_edac: Fix erroneous bytes->gigabytes conversion
  sb_edac: Fix off-by-one error in number of channels
---

709d9f09b6aee5828cb8f168f63030608176cd0e