1 files changed, 32 insertions, 5 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index bad19e9d9dcb..29801f760b6f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2174,6 +2174,8 @@ M:	Dan Williams <dan.j.williams@intel.com>
 S:      Supported
 F:      drivers/dma/
 F:      include/linux/dma*
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx.git
+T:      git git://git.infradead.org/users/vkoul/slave-dma.git (slave-dma)
 
 DME1737 HARDWARE MONITOR DRIVER
 M:      Juerg Haefliger <juergh@gmail.com>
@@ -2300,7 +2302,7 @@ F:	net/bridge/netfilter/ebt*.c
 ECRYPT FILE SYSTEM
 M:      Tyler Hicks <tyhicks@linux.vnet.ibm.com>
 M:      Dustin Kirkland <kirkland@canonical.com>
-L:      ecryptfs-devel@lists.launchpad.net
+L:      ecryptfs@vger.kernel.org
 W:      https://launchpad.net/ecryptfs
 S:      Supported
 F:      Documentation/filesystems/ecryptfs.txt
@@ -2580,6 +2582,13 @@ S:	Maintained
 F:      drivers/hwmon/f75375s.c
 F:      include/linux/f75375s.h
 
+FIREWIRE AUDIO DRIVERS
+M:      Clemens Ladisch <clemens@ladisch.de>
+L:      alsa-devel@alsa-project.org (moderated for non-subscribers)
+T:      git git://git.alsa-project.org/alsa-kernel.git
+S:      Maintained
+F:      sound/firewire/
+
 FIREWIRE SUBSYSTEM
 M:      Stefan Richter <stefanr@s5r6.in-berlin.de>
 L:      linux1394-devel@lists.sourceforge.net
@@ -3714,7 +3723,7 @@ KEYS/KEYRINGS:
 M:      David Howells <dhowells@redhat.com>
 L:      keyrings@linux-nfs.org
 S:      Maintained
-F:      Documentation/keys.txt
+F:      Documentation/security/keys.txt
 F:      include/linux/key.h
 F:      include/linux/key-type.h
 F:      include/keys/
@@ -3726,7 +3735,7 @@ M:	Mimi Zohar <zohar@us.ibm.com>
 L:      linux-security-module@vger.kernel.org
 L:      keyrings@linux-nfs.org
 S:      Supported
-F:      Documentation/keys-trusted-encrypted.txt
+F:      Documentation/security/keys-trusted-encrypted.txt
 F:      include/keys/trusted-type.h
 F:      security/keys/trusted.c
 F:      security/keys/trusted.h
@@ -3737,7 +3746,7 @@ M:	David Safford <safford@watson.ibm.com>
 L:      linux-security-module@vger.kernel.org
 L:      keyrings@linux-nfs.org
 S:      Supported
-F:      Documentation/keys-trusted-encrypted.txt
+F:      Documentation/security/keys-trusted-encrypted.txt
 F:      include/keys/encrypted-type.h
 F:      security/keys/encrypted.c
 F:      security/keys/encrypted.h
@@ -5439,6 +5448,13 @@ L:	linux-serial@vger.kernel.org
 S:      Maintained
 F:      drivers/tty/serial
 
+SYNOPSYS DESIGNWARE DMAC DRIVER
+M:      Viresh Kumar <viresh.kumar@st.com>
+S:      Maintained
+F:      include/linux/dw_dmac.h
+F:      drivers/dma/dw_dmac_regs.h
+F:      drivers/dma/dw_dmac.c
+
 TIMEKEEPING, NTP
 M:      John Stultz <johnstul@us.ibm.com>
 M:      Thomas Gleixner <tglx@linutronix.de>
@@ -5503,7 +5519,7 @@ F:	drivers/scsi/sg.c
 F:      include/scsi/sg.h
 
 SCSI SUBSYSTEM
-M:      "James E.J. Bottomley" <James.Bottomley@suse.de>
+M:      "James E.J. Bottomley" <JBottomley@parallels.com>
 L:      linux-scsi@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git
@@ -6072,6 +6088,17 @@ F:	Documentation/filesystems/sysv-fs.txt
 F:      fs/sysv/
 F:      include/linux/sysv_fs.h
 
+TARGET SUBSYSTEM
+M:      Nicholas A. Bellinger <nab@linux-iscsi.org>
+L:      linux-scsi@vger.kernel.org
+L:      http://groups.google.com/group/linux-iscsi-target-dev
+W:      http://www.linux-iscsi.org
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/nab/lio-core-2.6.git master
+S:      Supported
+F:      drivers/target/
+F:      include/target/
+F:      Documentation/target/
+
 TASKSTATS STATISTICS INTERFACE
 M:      Balbir Singh <balbir@linux.vnet.ibm.com>
 S:      Maintained