From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 29 Jan 2018 19:47:42 +0000 (-0800)
Subject: Merge tag 'edac_for_4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
X-Git-Tag: ceph-for-4.16-rc4~250
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=9697e9da84299d0d715d515dd2cc48f1eceb277d;p=ceph-client.git

Merge tag 'edac_for_4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp

Pull EDAC updates from Borislav Petkov:

 - new EDAC driver for some TI SOCs (Tero Kristo)

 - small cleanups

* tag 'edac_for_4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
  EDAC, mv64x60: Fix an error handling path
  EDAC, ti: Add support for TI keystone and DRA7xx EDAC
  EDAC, octeon: Fix an uninitialized variable warning
---

9697e9da84299d0d715d515dd2cc48f1eceb277d