Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx:
  fsldma: Fix compile warnings
  fsldma: fix memory leak on error path in fsl_dma_prep_memcpy()
  fsldma: snooping is not enabled for last entry in descriptor chain
  fsldma: fix infinite loop on multi-descriptor DMA chain completion
  fsldma: fix "DMA halt timeout!" errors
  fsldma: fix check on potential fdev->chan[] overflow
  fsldma: update mailling list address in MAINTAINERS

diff --combined MAINTAINERS
index 196f72d241d04244d75052776d40a171d9354d63,cac3e3b71d350d53dd164e480a549ad502e28722..873ca1fce020ba28d370d456683e544a87a04c38
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -434,7 -434,7 +434,7 @@@ F: arch/alpha
  
  AMD GEODE CS5536 USB DEVICE CONTROLLER DRIVER
  P:    Thomas Dahlmann
 -M:    [email protected]
 +M:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  F:    drivers/usb/gadget/amd5536udc.*
@@@ -624,7 -624,6 +624,7 @@@ M: [email protected]
  L:    [email protected] (subscribers-only)
  T:    git git://gitorious.org/linux-gemini/mainline.git
  S:    Maintained
 +F:    arch/arm/mach-gemini/
  
  ARM/EBSA110 MACHINE SUPPORT
  P:    Russell King
@@@ -651,7 -650,6 +651,7 @@@ P: Paulius Zalecka
  M:    [email protected]
  L:    [email protected] (subscribers-only)
  S:    Maintained
 +F:    arch/arm/mm/*-fa*
  
  ARM/FOOTBRIDGE ARCHITECTURE
  P:    Russell King
@@@ -1134,17 -1132,17 +1134,17 @@@ F:   fs/bfs
  F:    include/linux/bfs_fs.h
  
  BLACKFIN ARCHITECTURE
 -P:    Bryan Wu
 -M:    cooloney@kernel.org
 +P:    Mike Frysinger
 +M:    vapier@gentoo.org
  L:    [email protected]
  W:    http://blackfin.uclinux.org
  S:    Supported
  F:    arch/blackfin/
  
  BLACKFIN EMAC DRIVER
 -P:    Bryan Wu
 -M:    [email protected]
 -L:    [email protected] (subscribers-only)
 +P:    Michael Hennerich
 +M:    [email protected]
 +L:    [email protected]
  W:    http://blackfin.uclinux.org
  S:    Supported
  F:    drivers/net/bfin_mac.*
@@@ -1152,7 -1150,7 +1152,7 @@@
  BLACKFIN RTC DRIVER
  P:    Mike Frysinger
  M:    [email protected]
 -L:    [email protected] (subscribers-only)
 +L:    [email protected]
  W:    http://blackfin.uclinux.org
  S:    Supported
  F:    drivers/rtc/rtc-bfin.c
@@@ -1160,7 -1158,7 +1160,7 @@@
  BLACKFIN SERIAL DRIVER
  P:    Sonic Zhang
  M:    [email protected]
 -L:    [email protected] (subscribers-only)
 +L:    [email protected]
  W:    http://blackfin.uclinux.org
  S:    Supported
  F:    drivers/serial/bfin_5xx.c
@@@ -1168,7 -1166,7 +1168,7 @@@
  BLACKFIN WATCHDOG DRIVER
  P:    Mike Frysinger
  M:    [email protected]
 -L:    [email protected] (subscribers-only)
 +L:    [email protected]
  W:    http://blackfin.uclinux.org
  S:    Supported
  F:    drivers/watchdog/bfin_wdt.c
@@@ -1176,7 -1174,7 +1176,7 @@@
  BLACKFIN I2C TWI DRIVER
  P:    Sonic Zhang
  M:    [email protected]
 -L:    [email protected] (subscribers-only)
 +L:    [email protected]
  W:    http://blackfin.uclinux.org/
  S:    Supported
  F:    drivers/i2c/busses/i2c-bfin-twi.c
@@@ -1433,14 -1431,6 +1433,14 @@@ P:    Russell Kin
  M:    [email protected]
  F:    include/linux/clk.h
  
 +CISCO FCOE HBA DRIVER
 +P:    Abhijeet Joglekar
 +M:    [email protected]
 +P:    Joe Eykholt
 +M:    [email protected]
 +L:    [email protected]
 +S:    Supported
 +
  CODA FILE SYSTEM
  P:    Jan Harkes
  M:    [email protected]
@@@ -1973,8 -1963,8 +1973,8 @@@ F:      include/linux/edac.
  
  EDAC-E752X
  P:    Mark Gross
 -P:    Doug Thompson
  M:    [email protected]
 +P:    Doug Thompson
  M:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  W:    bluesmoke.sourceforge.net
@@@ -2251,7 -2241,7 +2251,7 @@@ P:      Li Yan
  M:    [email protected]
  P:    Zhang Wei
  M:    [email protected]
- L:    linuxppc-embedded@ozlabs.org
+ L:    linuxppc-dev@ozlabs.org
  L:    [email protected]
  S:    Maintained
  F:    drivers/dma/fsldma.*
@@@ -5589,14 -5579,6 +5589,14 @@@ M:    [email protected]
  S:    Maintained
  F:    drivers/mmc/host/tmio_mmc.*
  
 +TMPFS (SHMEM FILESYSTEM)
 +P:    Hugh Dickins
 +M:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    include/linux/shmem_fs.h
 +F:    mm/shmem.c
 +
  TPM DEVICE DRIVER
  P:    Debora Velarde
  M:    [email protected]