From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 3 Jul 2015 19:10:12 +0000 (-0700)
Subject: Merge tag 'edac_urgent_for_4.2' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: firefly_0821_release~176^2~1480
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b53343fc6c6f30ff5c6391d6f56d531afc2f4f7a;p=firefly-linux-kernel-4.4.55.git

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

Pull EDAC fix from Borislav Petkov:
 "A build fix for octeon_edac from Aaro Koskinen"

* tag 'edac_urgent_for_4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
  EDAC, octeon: Fix broken build due to model helper renames
---

b53343fc6c6f30ff5c6391d6f56d531afc2f4f7a