Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma

Pull slave-dmaengine updates from Vinod Koul:
 "For dmaengine contributions we have:
   - designware cleanup by Andy
   - my series moving device_control users to dmanegine_xxx APIs for
     later removal of device_control API
   - minor fixes spread over drivers mainly mv_xor, pl330, mmp, imx-sdma
     etc"

* 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma: (60 commits)
  serial: atmel: add missing dmaengine header
  dmaengine: remove FSLDMA_EXTERNAL_START
  dmaengine: freescale: remove FSLDMA_EXTERNAL_START control method
  carma-fpga: move to fsl_dma_external_start()
  carma-fpga: use dmaengine_xxx() API
  dmaengine: freescale: add and export fsl_dma_external_start()
  dmaengine: add dmaengine_prep_dma_sg() helper
  video: mx3fb: use dmaengine_terminate_all() API
  serial: sh-sci: use dmaengine_terminate_all() API
  net: ks8842: use dmaengine_terminate_all() API
  mtd: sh_flctl: use dmaengine_terminate_all() API
  mtd: fsmc_nand: use dmaengine_terminate_all() API
  V4L2: mx3_camer: use dmaengine_pause() API
  dmaengine: coh901318: use dmaengine_terminate_all() API
  pata_arasan_cf: use dmaengine_terminate_all() API
  dmaengine: edma: check for echan->edesc => NULL in edma_dma_pause()
  dmaengine: dw: export probe()/remove() and Co to users
  dmaengine: dw: enable and disable controller when needed
  dmaengine: dw: always export dw_dma_{en,dis}able
  dmaengine: dw: introduce dw_dma_on() helper
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/dma/Kconfig
Simple merge

diff --cc drivers/dma/mv_xor.c
Simple merge

diff --cc drivers/misc/carma/carma-fpga-program.c
Simple merge

diff --cc drivers/spi/spi-pxa2xx-pci.c
Simple merge

diff --cc drivers/spi/spi-pxa2xx.c
Simple merge

diff --cc drivers/tty/serial/8250/8250.h
Simple merge

diff --cc drivers/tty/serial/8250/8250_dw.c
Simple merge

diff --cc drivers/tty/serial/8250/8250_pci.c
index 4f1cd296f1b13bb4a56d55f5b5e96d76a2a0b6fe,85a2eb986ffe86690ec724bcb9d32229b736da1e..beb9d71cd47ae499cc6e9bc585f8affe16d1d8ad
--- 1/drivers/tty/serial/8250/8250_pci.c
--- 2/drivers/tty/serial/8250/8250_pci.c
+++ b/drivers/tty/serial/8250/8250_pci.c
@@@ -1886,13 -1932,20 +1920,27 @@@ static struct pci_serial_quirk pci_seri
                .subdevice      = PCI_ANY_ID,
                .setup          = byt_serial_setup,
        },
 +      {
 +              .vendor         = PCI_VENDOR_ID_INTEL,
 +              .device         = PCI_DEVICE_ID_INTEL_QRK_UART,
 +              .subvendor      = PCI_ANY_ID,
 +              .subdevice      = PCI_ANY_ID,
 +              .setup          = pci_default_setup,
 +      },
+       {
+               .vendor         = PCI_VENDOR_ID_INTEL,
+               .device         = PCI_DEVICE_ID_INTEL_BSW_UART1,
+               .subvendor      = PCI_ANY_ID,
+               .subdevice      = PCI_ANY_ID,
+               .setup          = byt_serial_setup,
+       },
+       {
+               .vendor         = PCI_VENDOR_ID_INTEL,
+               .device         = PCI_DEVICE_ID_INTEL_BSW_UART2,
+               .subvendor      = PCI_ANY_ID,
+               .subdevice      = PCI_ANY_ID,
+               .setup          = byt_serial_setup,
+       },
        /*
         * ITE
         */

diff --cc drivers/tty/serial/atmel_serial.c
Simple merge

diff --cc drivers/video/fbdev/mx3fb.c
Simple merge

diff --cc include/linux/dmaengine.h
Simple merge