Merge branch 'upstream' of git://git.infradead.org/~dedekind/ubi-2.6

[GitHub/MotorolaMobilityLLC/kernel-slsi.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 5abec1435ad8c94c5a25979d86c016d7b3452654..1698dbbc737565e7d263f5199b28bbc191b710cd 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -913,6 +913,12 @@ M: mchan@broadcom.com
 L:     netdev@vger.kernel.org
 S:     Supported
 
+BSG (block layer generic sg v4 driver)
+P:     FUJITA Tomonori
+M:     fujita.tomonori@lab.ntt.co.jp
+L:     linux-scsi@vger.kernel.org
+S:     Supported
+
 BTTV VIDEO4LINUX DRIVER
 P:     Mauro Carvalho Chehab
 M:     mchehab@infradead.org
@@ -2387,7 +2393,7 @@ 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
+T:     git git://git.infradead.org/~dedekind/ubi-2.6.git
 S:     Maintained
 
 MICROTEK X6 SCANNER
@@ -4104,6 +4110,11 @@ W:       http://www.polyware.nl/~middelin/En/hobbies.html
 W:     http://www.polyware.nl/~middelin/hobbies.html
 S:     Maintained
 
+ZS DECSTATION Z85C30 SERIAL DRIVER
+P:     Maciej W. Rozycki
+M:     macro@linux-mips.org
+S:     Maintained
+
 THE REST
 P:     Linus Torvalds
 S:     Buried alive in reporters