From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 20 Aug 2018 22:28:54 +0000 (-0700)
Subject: Merge tag 'edac_fixes_for_4.19' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v4.19-rc1~82
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=8786583db54197b3859311870912f51cb3fca434;p=users%2Fjedix%2Flinux-maple.git

Merge tag 'edac_fixes_for_4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp

Pull EDAC fix from Borislav Petkov:
 "An urgent fix for a NULL ptr deref on machines with LRDDR4 DIMMs, from
  Takashi Iwai"

* tag 'edac_fixes_for_4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
  EDAC: Add missing MEM_LRDDR4 entry in edac_mem_types[]
---

8786583db54197b3859311870912f51cb3fca434