Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6

[firefly-linux-kernel-4.4.55.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index f56c7e172cee12c6bf457767800662a20e1d48ed..5519d257b55685dc681156a6636c088bad3bdc0b 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2246,6 +2246,14 @@ L:       linux-mtd@lists.infradead.org
 T:     git git://git.infradead.org/mtd-2.6.git
 S:     Maintained
 
+UNSORTED BLOCK IMAGES (UBI)
+P:     Artem Bityutskiy
+M:     dedekind@infradead.org
+W:     http://www.linux-mtd.infradead.org/
+L:     linux-mtd@lists.infradead.org
+T:     git git://git.infradead.org/ubi-2.6.git
+S:     Maintained
+
 MICROTEK X6 SCANNER
 P:     Oliver Neukum
 M:     oliver@neukum.name
@@ -2972,8 +2980,10 @@ P:       Stephen Smalley
 M:     sds@tycho.nsa.gov
 P:     James Morris
 M:     jmorris@namei.org
+P:     Eric Paris
+M:     eparis@parisplace.org
 L:     linux-kernel@vger.kernel.org (kernel issues)
-L:     selinux@tycho.nsa.gov (general discussion)
+L:     selinux@tycho.nsa.gov (subscribers-only, general discussion)
 W:     http://www.nsa.gov/selinux
 S:     Supported