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

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

diff --combined MAINTAINERS
index ab483778a7fc52629759562bff63bac89aed71ea,fa52a307d8943e304f2d50ebbb5121e18935075f..d3a0684945b41e3a5c39a684a391d6011b823f53
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -612,6 -612,15 +612,15 @@@ W:       http://sourceforge.net/projects/acpi
  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
@@@ -664,7 -673,7 +673,7 @@@ S: Maintaine
  AUDIT SUBSYSTEM
  P:    David Woodhouse
  M:    dwmw2@infradead.org
 -L:    linux-audit@redhat.com
 +L:    linux-audit@redhat.com (subscribers-only)
  W:    http://people.redhat.com/sgrubb/audit/
  T:    git kernel.org:/pub/scm/linux/kernel/git/dwmw2/audit-2.6.git
  S:    Maintained
@@@ -1277,11 -1286,13 +1286,13 @@@ M:   tori@unhappy.mine.n
  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 +1969,12 @@@ M:    shannon.nelson@intel.co
  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