Merge remote-tracking branches 'asoc/fix/adau1761', 'asoc/fix/fsl', 'asoc/fix/intel...

[linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index b4b05dd4ffe3544e19e41456acd54b3402aa4e92..dab92a78d1d5e5756d474109b3061290afd67550 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1749,6 +1749,13 @@ M:       Nicolas Ferre <[email protected]>
 S:     Supported
 F:     drivers/spi/spi-atmel.*
 
+ATMEL SSC DRIVER
+M:     Bo Shen <[email protected]>
+L:     [email protected] (moderated for non-subscribers)
+S:     Supported
+F:     drivers/misc/atmel-ssc.c
+F:     include/linux/atmel-ssc.h
+
 ATMEL Timer Counter (TC) AND CLOCKSOURCE DRIVERS
 M:     Nicolas Ferre <[email protected]>
 L:     [email protected] (moderated for non-subscribers)
@@ -6830,7 +6837,7 @@ S:        Orphan
 F:     drivers/net/wireless/orinoco/
 
 OSD LIBRARY and FILESYSTEM
-M:     Boaz Harrosh <bharrosh@panasas.com>
+M:     Boaz Harrosh <ooo@electrozaur.com>
 M:     Benny Halevy <[email protected]>
 L:     [email protected]
 W:     http://open-osd.org
@@ -6840,6 +6847,13 @@ F:       drivers/scsi/osd/
 F:     include/scsi/osd_*
 F:     fs/exofs/
 
+OVERLAYFS FILESYSTEM
+M:     Miklos Szeredi <[email protected]>
+L:     [email protected]
+S:     Supported
+F:     fs/overlayfs/*
+F:     Documentation/filesystems/overlayfs.txt
+
 P54 WIRELESS DRIVER
 M:     Christian Lamparter <[email protected]>
 L:     [email protected]