Merge branch 'for-linus-v3.20' of git://git.infradead.org/linux-ubifs

[mirror_ubuntu-artful-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 3ac697a64280024b6913011c1627fe1ae4056dcc..1c7e321f77b8a7eed8a55e9f98baa73ba4192d6a 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9990,20 +9990,15 @@ F:      drivers/scsi/ufs/
 
 UNSORTED BLOCK IMAGES (UBI)
 M:     Artem Bityutskiy <dedekind1@gmail.com>
+M:     Richard Weinberger <richard@nod.at>
 W:     http://www.linux-mtd.infradead.org/
 L:     linux-mtd@lists.infradead.org
 T:     git git://git.infradead.org/ubifs-2.6.git
-S:     Maintained
+S:     Supported
 F:     drivers/mtd/ubi/
 F:     include/linux/mtd/ubi.h
 F:     include/uapi/mtd/ubi-user.h
 
-UNSORTED BLOCK IMAGES (UBI) Fastmap
-M:     Richard Weinberger <richard@nod.at>
-L:     linux-mtd@lists.infradead.org
-S:     Maintained
-F:     drivers/mtd/ubi/fastmap.c
-
 USB ACM DRIVER
 M:     Oliver Neukum <oliver@neukum.org>
 L:     linux-usb@vger.kernel.org