summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-01-29 11:47:42 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2018-01-29 11:47:42 -0800
commit9697e9da84299d0d715d515dd2cc48f1eceb277d (patch)
treeaab3df77a5665d966fd1a1f3aafec321aa982c6b /MAINTAINERS
parentb5856f97b3cb792806cee5d2b2c747353d238bbf (diff)
parent68fa24f9121c04ef146b5158f538c8b32f285be5 (diff)
downloadlinux-9697e9da84299d0d715d515dd2cc48f1eceb277d.tar.gz
linux-9697e9da84299d0d715d515dd2cc48f1eceb277d.tar.bz2
linux-9697e9da84299d0d715d515dd2cc48f1eceb277d.zip
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
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS6
1 files changed, 6 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index d9da617b65c4..a9c9c9ff72d8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5141,6 +5141,12 @@ L: linux-edac@vger.kernel.org
S: Maintained
F: drivers/edac/skx_edac.c
+EDAC-TI
+M: Tero Kristo <t-kristo@ti.com>
+L: linux-edac@vger.kernel.org
+S: Maintained
+F: drivers/edac/ti_edac.c
+
EDIROL UA-101/UA-1000 DRIVER
M: Clemens Ladisch <clemens@ladisch.de>
L: alsa-devel@alsa-project.org (moderated for non-subscribers)