Merge remote-tracking branch 'ftrace/for-next'

[deliverable/linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 3ed372abc0cf8b58916d8cee3387a8a7f12c146b..ad7647e9d1122672fe9d7b5d5beb572e77c5ad1a 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4425,7 +4425,6 @@ F:        Documentation/filesystems/ecryptfs.txt
 F:     fs/ecryptfs/
 
 EDAC-CORE
-M:     Doug Thompson <dougthompson@xmission.com>
 M:     Borislav Petkov <bp@alien8.de>
 M:     Mauro Carvalho Chehab <mchehab@s-opensource.com>
 M:     Mauro Carvalho Chehab <mchehab@kernel.org>
@@ -4438,14 +4437,12 @@ F:      drivers/edac/
 F:     include/linux/edac.h
 
 EDAC-AMD64
-M:     Doug Thompson <dougthompson@xmission.com>
 M:     Borislav Petkov <bp@alien8.de>
 L:     linux-edac@vger.kernel.org
 S:     Maintained
 F:     drivers/edac/amd64_edac*
 
 EDAC-CALXEDA
-M:     Doug Thompson <dougthompson@xmission.com>
 M:     Robert Richter <rric@kernel.org>
 L:     linux-edac@vger.kernel.org
 S:     Maintained
@@ -4461,17 +4458,21 @@ F:      drivers/edac/octeon_edac*
 
 EDAC-E752X
 M:     Mark Gross <mark.gross@intel.com>
-M:     Doug Thompson <dougthompson@xmission.com>
 L:     linux-edac@vger.kernel.org
 S:     Maintained
 F:     drivers/edac/e752x_edac.c
 
 EDAC-E7XXX
-M:     Doug Thompson <dougthompson@xmission.com>
 L:     linux-edac@vger.kernel.org
 S:     Maintained
 F:     drivers/edac/e7xxx_edac.c
 
+EDAC-FSL_DDR
+M:     York Sun <york.sun@nxp.com>
+L:     linux-edac@vger.kernel.org
+S:     Maintained
+F:     drivers/edac/fsl_ddr_edac.*
+
 EDAC-GHES
 M:     Mauro Carvalho Chehab <mchehab@s-opensource.com>
 M:     Mauro Carvalho Chehab <mchehab@kernel.org>
@@ -4486,13 +4487,11 @@ S:      Maintained
 F:     drivers/edac/i82443bxgx_edac.c
 
 EDAC-I3000
-M:     Jason Uhlenkott <juhlenko@akamai.com>
 L:     linux-edac@vger.kernel.org
-S:     Maintained
+S:     Orphan
 F:     drivers/edac/i3000_edac.c
 
 EDAC-I5000
-M:     Doug Thompson <dougthompson@xmission.com>
 L:     linux-edac@vger.kernel.org
 S:     Maintained
 F:     drivers/edac/i5000_edac.c
@@ -8908,6 +8907,7 @@ S:        Supported
 F:     Documentation/virtual/paravirt_ops.txt
 F:     arch/*/kernel/paravirt*
 F:     arch/*/include/asm/paravirt.h
+F:     include/linux/hypervisor.h
 
 PARIDE DRIVERS FOR PARALLEL PORT IDE DEVICES
 M:     Tim Waugh <tim@cyberelk.net>
@@ -11178,6 +11178,7 @@ F:      Documentation/spi/
 F:     drivers/spi/
 F:     include/linux/spi/
 F:     include/uapi/linux/spi/
+F:     tools/spi/
 
 SPIDERNET NETWORK DRIVER for CELL
 M:     Ishizaki Kou <kou.ishizaki@toshiba.co.jp>