Merge tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index b2fcd1c6bdcb0cc0e122c7f0afa054f7eb5e80f7..e20e7c42347bd78204c3df4f4fcbb263c4282534 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8254,7 +8254,7 @@ F:        drivers/ata/pata_arasan_cf.c
 
 LIBATA PATA DRIVERS
 M:     Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
-M:     Tejun Heo <tj@kernel.org>
+M:     Jens Axboe <kernel.dk>
 L:     linux-ide@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
 S:     Maintained
@@ -8272,7 +8272,7 @@ F:        drivers/ata/sata_gemini.h
 
 LIBATA SATA AHCI PLATFORM devices support
 M:     Hans de Goede <hdegoede@redhat.com>
-M:     Tejun Heo <tj@kernel.org>
+M:     Jens Axboe <axboe@kernel.dk>
 L:     linux-ide@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
 S:     Maintained
@@ -8288,7 +8288,7 @@ S:        Maintained
 F:     drivers/ata/sata_promise.*
 
 LIBATA SUBSYSTEM (Serial and Parallel ATA drivers)
-M:     Tejun Heo <tj@kernel.org>
+M:     Jens Axboe <axboe@kernel.dk>
 L:     linux-ide@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
 S:     Maintained