Merge branch 'async-tx-fixes-for-linus' of git://lost.foo-projects.org/~dwillia2/git/iop

* 'async-tx-fixes-for-linus' of git://lost.foo-projects.org/~dwillia2/git/iop:
  async_tx: update MAINTAINERS for async_tx and iop-adma

1 files changed, 19 insertions, 2 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index ab483778a7fc..d3a0684945b4 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -612,6 +612,15 @@ W:	http://sourceforge.net/projects/acpi4asus
 W:      http://xf.iksaif.net/acpi4asus
 S:      Maintained
 
+ASYNCHRONOUS TRANSFERS/TRANSFORMS API
+P:      Dan Williams
+M:      dan.j.williams@intel.com
+P:      Shannon Nelson
+M:      shannon.nelson@intel.com
+L:      linux-kernel@vger.kernel.org
+W:      http://sourceforge.net/projects/xscaleiop
+S:      Supported
+
 ATA OVER ETHERNET DRIVER
 P:      Ed L. Cashin
 M:      ecashin@coraid.com
@@ -1277,11 +1286,13 @@ M:	tori@unhappy.mine.nu
 L:      netdev@vger.kernel.org
 S:      Maintained
 
-DMA GENERIC MEMCPY SUBSYSTEM
+DMA GENERIC OFFLOAD ENGINE SUBSYSTEM
 P:      Shannon Nelson
 M:      shannon.nelson@intel.com
+P:      Dan Williams
+M:      dan.j.williams@intel.com
 L:      linux-kernel@vger.kernel.org
-S:      Maintained
+S:      Supported
 
 DME1737 HARDWARE MONITOR DRIVER
 P:      Juerg Haefliger
@@ -1958,6 +1969,12 @@ M:	shannon.nelson@intel.com
 L:      linux-kernel@vger.kernel.org
 S:      Supported
 
+INTEL IOP-ADMA DMA DRIVER
+P:      Dan Williams
+M:      dan.j.williams@intel.com
+L:      linux-kernel@vger.kernel.org
+S:      Supported
+
 INTEL IXP4XX RANDOM NUMBER GENERATOR SUPPORT
 P:      Deepak Saxena
 M:      dsaxena@plexity.net