rbd: make discard trigger copy-on-write

[mirror_ubuntu-zesty-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 37054306dc9f31462d9defed2696bd795fcbc151..f10ed3914ea85da75f4f61c86533dd04abcfce5e 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1665,6 +1665,12 @@ M:       Nicolas Ferre <nicolas.ferre@atmel.com>
 S:     Supported
 F:     drivers/tty/serial/atmel_serial.c
 
+ATMEL Audio ALSA driver
+M:     Bo Shen <voice.shen@atmel.com>
+L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
+S:     Supported
+F:     sound/soc/atmel
+
 ATMEL DMA DRIVER
 M:     Nicolas Ferre <nicolas.ferre@atmel.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -2098,7 +2104,7 @@ S:        Supported
 F:     drivers/scsi/bfa/
 
 BROCADE BNA 10 GIGABIT ETHERNET DRIVER
-M:     Rasesh Mody <rmody@brocade.com>
+M:     Rasesh Mody <rasesh.mody@qlogic.com>
 L:     netdev@vger.kernel.org
 S:     Supported
 F:     drivers/net/ethernet/brocade/bna/
@@ -5478,7 +5484,7 @@ F:        drivers/macintosh/
 LINUX FOR POWERPC EMBEDDED MPC5XXX
 M:     Anatolij Gustschin <agust@denx.de>
 L:     linuxppc-dev@lists.ozlabs.org
-T:     git git://git.denx.de/linux-2.6-agust.git
+T:     git git://git.denx.de/linux-denx-agust.git
 S:     Maintained
 F:     arch/powerpc/platforms/512x/
 F:     arch/powerpc/platforms/52xx/