summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-04-03 14:18:16 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-04-03 14:18:16 +0200
commit9ccd8d744592b594db217b80af651e3f10e6a96e (patch)
tree7321748b8c5b1621e618f5fed16216124c44e734 /MAINTAINERS
parentabf1e0a98083fd0a1069ce68ad8c92bfb97a57db (diff)
parenta71c9a1c779f2499fb2afc0553e543f18aff6edf (diff)
downloadop-kernel-dev-9ccd8d744592b594db217b80af651e3f10e6a96e.zip
op-kernel-dev-9ccd8d744592b594db217b80af651e3f10e6a96e.tar.gz
Merge 4.11-rc5 into tty-next
We want the serial fixes in here as well to handle merge issues. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS6
1 files changed, 6 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index e2f7351..56ac4fb 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4775,6 +4775,12 @@ L: linux-edac@vger.kernel.org
S: Maintained
F: drivers/edac/mpc85xx_edac.[ch]
+EDAC-PND2
+M: Tony Luck <tony.luck@intel.com>
+L: linux-edac@vger.kernel.org
+S: Maintained
+F: drivers/edac/pnd2_edac.[ch]
+
EDAC-PASEMI
M: Egor Martovetsky <egor@pasemi.com>
L: linux-edac@vger.kernel.org
OpenPOWER on IntegriCloud