USB: update MAINAINERS and CREDITS for Freescale USB driver

[mirror_ubuntu-artful-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index f56c7e172cee12c6bf457767800662a20e1d48ed..83896d82128fbbdc0358aabeb7cadb3925f17a76 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -975,6 +975,11 @@ M: mhw@wittsend.com
 W:     http://www.wittsend.com/computone.html
 S:     Maintained
 
+CONEXANT ACCESSRUNNER USB DRIVER
+P:     Simon Arlott
+M:     cxacru@fire.lp0.eu
+S:     Maintained
+
 COSA/SRP SYNC SERIAL DRIVER
 P:     Jan "Yenya" Kasprzak
 M:     kas@fi.muni.cz
@@ -1383,6 +1388,13 @@ L:       linuxppc-embedded@ozlabs.org
 L:     netdev@vger.kernel.org
 S:     Maintained
 
+FREESCALE HIGHSPEED USB DEVICE DRIVER
+P:     Li Yang
+M:     leoli@freescale.com
+L:     linux-usb-devel@lists.sourceforge.net
+L:     linuxppc-embedded@ozlabs.org
+S:     Maintained
+
 FILE LOCKING (flock() and fcntl()/lockf())
 P:     Matthew Wilcox
 M:     matthew@wil.cx
@@ -2246,6 +2258,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 +2992,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