diff --git a/MAINTAINERS b/MAINTAINERS
index 3671fdea5010e351ff5cedabde6dee83a8db9d7c..7a8e3932dc407d89e6bf3c549333999796b4c9c9 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -14473,14 +14473,9 @@ T:	git git://linuxtv.org/media_tree.git
 S:	Maintained
 F:	drivers/media/i2c/imx355.c
 
-SONY MEMORYSTICK CARD SUPPORT
-M:	Alex Dubov <oakad@yahoo.com>
-W:	http://tifmxx.berlios.de/
-S:	Maintained
-F:	drivers/memstick/host/tifm_ms.c
-
 SONY MEMORYSTICK STANDARD SUPPORT
 M:	Maxim Levitsky <maximlevitsky@gmail.com>
+M:	Alex Dubov <oakad@yahoo.com>
 S:	Maintained
 F:	drivers/memstick/core/ms_block.*
 
@@ -15507,9 +15502,11 @@ S:	Maintained
 F:	drivers/net/ethernet/ti/cpsw*
 F:	drivers/net/ethernet/ti/davinci*
 
-TI FLASH MEDIA INTERFACE DRIVER
+TI FLASH MEDIA MEMORYSTICK/MMC DRIVERS
 M:	Alex Dubov <oakad@yahoo.com>
 S:	Maintained
+W:	http://tifmxx.berlios.de/
+F:	drivers/memstick/host/tifm_ms.c
 F:	drivers/misc/tifm*
 F:	drivers/mmc/host/tifm_sd.c
 F:	include/linux/tifm.h