Merge tag 'v3.10' into next

[linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 5be702cc8449d3edb8107256bb03bac25d937238..b888b1a4d247c5564e2cbb132a692078ca5e6f4f 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3103,6 +3103,13 @@ M:       Maxim Levitsky <[email protected]>
 S:     Maintained
 F:     drivers/media/rc/ene_ir.*
 
+ENHANCED ERROR HANDLING (EEH)
+M:     Gavin Shan <[email protected]>
+L:     [email protected]
+S:     Supported
+F:     Documentation/powerpc/eeh-pci-error-recovery.txt
+F:     arch/powerpc/kernel/eeh*.c
+
 EPSON S1D13XXX FRAMEBUFFER DRIVER
 M:     Kristoffer Ericson <[email protected]>
 S:     Maintained
@@ -3220,7 +3227,7 @@ F:        lib/fault-inject.c
 
 FCOE SUBSYSTEM (libfc, libfcoe, fcoe)
 M:     Robert Love <[email protected]>
-L:     [email protected]
+L:     fcoe-[email protected]
 W:     www.Open-FCoE.org
 S:     Supported
 F:     drivers/scsi/libfc/
@@ -6149,7 +6156,6 @@ M:        Linas Vepstas <[email protected]>
 L:     [email protected]
 S:     Supported
 F:     Documentation/PCI/pci-error-recovery.txt
-F:     Documentation/powerpc/eeh-pci-error-recovery.txt
 
 PCI SUBSYSTEM
 M:     Bjorn Helgaas <[email protected]>