Merge branch 'dma_slave_direction' into next_test_dirn
authorVinod Koul <vinod.koul@linux.intel.com>
Thu, 17 Nov 2011 09:24:38 +0000 (14:54 +0530)
committerVinod Koul <vinod.koul@linux.intel.com>
Thu, 17 Nov 2011 09:24:57 +0000 (14:54 +0530)
commite0d23ef29ed637dc6bd739f590985746d9ad9caa
treec5b5856dc88582697997bb10ccacad6fc2535465
parentca7fe2db892dcf91b2c72ee352eda4ff867903a7
parent55ba4e5ed4ac57b60fe56acfd324f6a87123cc34
Merge branch 'dma_slave_direction' into next_test_dirn

resolved conflicts:
drivers/media/video/mx3_camera.c
29 files changed:
arch/arm/plat-samsung/dma-ops.c
drivers/dma/at_hdmac.c
drivers/dma/imx-dma.c
drivers/dma/imx-sdma.c
drivers/dma/intel_mid_dma.c
drivers/dma/ipu/ipu_idmac.c
drivers/dma/pch_dma.c
drivers/dma/pl330.c
drivers/dma/ste_dma40.c
drivers/media/video/mx3_camera.c
drivers/media/video/timblogiw.c
drivers/mmc/host/atmel-mci.c
drivers/mmc/host/mmci.c
drivers/mmc/host/mxcmmc.c
drivers/mmc/host/mxs-mmc.c
drivers/mmc/host/sh_mmcif.c
drivers/net/ethernet/micrel/ks8842.c
drivers/spi/spi-dw-mid.c
drivers/spi/spi-ep93xx.c
drivers/spi/spi-pl022.c
drivers/spi/spi-topcliff-pch.c
drivers/tty/serial/amba-pl011.c
drivers/tty/serial/pch_uart.c
drivers/tty/serial/sh-sci.c
drivers/usb/renesas_usbhs/fifo.c
drivers/video/mx3fb.c
include/linux/dmaengine.h
sound/soc/ep93xx/ep93xx-pcm.c
sound/soc/samsung/dma.c