Merge tag 'edac_for_4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 29 Jan 2018 19:47:42 +0000 (11:47 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 29 Jan 2018 19:47:42 +0000 (11:47 -0800)
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

1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge