Merge tag 'for-linus-20190524' of git://git.kernel.dk/linux-block

[uclinux-h8/linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 8349c1a..2336dd2 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2627,7 +2627,7 @@ F:        Documentation/devicetree/bindings/eeprom/at24.txt
 F:     drivers/misc/eeprom/at24.c
 
 ATA OVER ETHERNET (AOE) DRIVER
-M:     "Ed L. Cashin" <ed.cashin@acm.org>
+M:     "Justin Sanders" <justin@coraid.com>
 W:     http://www.openaoe.org/
 S:     Supported
 F:     Documentation/aoe/
@@ -11226,7 +11226,7 @@ F:      drivers/video/fbdev/riva/
 F:     drivers/video/fbdev/nvidia/
 
 NVM EXPRESS DRIVER
-M:     Keith Busch <keith.busch@intel.com>
+M:     Keith Busch <kbusch@kernel.org>
 M:     Jens Axboe <axboe@fb.com>
 M:     Christoph Hellwig <hch@lst.de>
 M:     Sagi Grimberg <sagi@grimberg.me>