From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 13 Aug 2015 17:22:11 +0000 (-0700)
Subject: Merge tag 'edac_fix_for_4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
X-Git-Tag: v4.14-rc1~4903
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2331d30dc8c121c0f350a27fda9e9154b8d3c178;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'edac_fix_for_4.2' of git://git./linux/kernel/git/bp/bp

Pull EDAC fix from Borislav Petkov:
 "A ppc4xx_edac fix for accessing ->csrows properly.  This driver was
  missed during the conversion a couple of years ago"

* tag 'edac_fix_for_4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
  EDAC, ppc4xx: Access mci->csrows array elements properly
---

2331d30dc8c121c0f350a27fda9e9154b8d3c178