Arnd Bergmann 6b204283f2 Merge branch 'imx/pinctrl' into imx/dt ...

Conflicts:
	drivers/mmc/host/sdhci-esdhc-imx.c
	drivers/net/ethernet/freescale/fec.c
	drivers/spi/spi-imx.c
	drivers/tty/serial/imx.c

This resolves some simply but annoying conflicts.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

2012-05-14 15:23:13 +02:00

..

ioat

dmaengine-fixes for 3.4-rc3

2012-04-10 15:30:16 -07:00

ipu

dmaengine i.MX ipu: clk_prepare/unprepare clock

2012-04-25 17:03:43 +02:00

ppc4xx

dmaengine: ensure all DMA engine drivers initialize their cookies

2012-03-13 11:37:42 +05:30

amba-pl08x.c

dmaengine/amba-pl08x : reset phychan_hold on terminate all

2012-04-25 15:10:57 +05:30

at_hdmac_regs.h

dmaengine: at_hdmac: add slave config operation

2012-03-21 21:12:29 +05:30

at_hdmac.c

dmaengine: at_hdmac: remove clear-on-read in atc_dostart()

2012-04-20 15:38:05 +05:30

coh901318_lli.c

dmaengine: move drivers to dma_transfer_direction

2011-10-27 20:53:43 +05:30

coh901318_lli.h

dmaengine: move drivers to dma_transfer_direction

2011-10-27 20:53:43 +05:30

coh901318.c

Merge branch 'akpm' (Andrew's patch-bomb)

2012-04-05 15:30:34 -07:00

dmaengine.c

dmaengine-fixes for 3.4-rc3

2012-04-10 15:30:16 -07:00

dmaengine.h

dmaengine: consolidate initialization of cookies

2012-03-13 11:37:22 +05:30

dmatest.c

dmaengine: fix missing 'cnt' in ?: in dmatest

2012-01-23 11:43:18 -08:00

dw_dmac_regs.h

dmaengine: move last completed cookie into generic dma_chan structure

2012-03-13 11:36:06 +05:30

dw_dmac.c

dmaengine: add context parameter to prep_slave_sg and prep_dma_cyclic

2012-03-21 19:20:23 +05:30

ep93xx_dma.c

dmaengine: add context parameter to prep_slave_sg and prep_dma_cyclic

2012-03-21 19:20:23 +05:30

fsldma.c

dmaengine: add context parameter to prep_slave_sg and prep_dma_cyclic

2012-03-21 19:20:23 +05:30

fsldma.h

dmaengine: move last completed cookie into generic dma_chan structure

2012-03-13 11:36:06 +05:30

imx-dma.c

dmaengine: imx-dma: dont complete descriptor for cyclic dma

2012-04-20 15:28:07 +05:30

imx-sdma.c

dmaengine i.MX SDMA: do not depend on grouped clocks

2012-04-25 17:03:35 +02:00

intel_mid_dma_regs.h

dmaengine: move last completed cookie into generic dma_chan structure

2012-03-13 11:36:06 +05:30

intel_mid_dma.c

dmaengine: add context parameter to prep_slave_sg and prep_dma_cyclic

2012-03-21 19:20:23 +05:30

iop-adma.c

dmaengine-fixes for 3.4-rc3

2012-04-10 15:30:16 -07:00

iovlock.c

…

Kconfig

dmaengine: Kconfig: fix Atmel at_hdmac entry

2012-04-17 16:29:41 +02:00

Makefile

DMA: sa11x0: add SA-11x0 DMA driver

2012-03-07 11:32:21 +00:00

mpc512x_dma.c

dmaengine: consolidate initialization of cookies

2012-03-13 11:37:22 +05:30

mv_xor.c

dmaengine: ensure all DMA engine drivers initialize their cookies

2012-03-13 11:37:42 +05:30

mv_xor.h

dmaengine: move last completed cookie into generic dma_chan structure

2012-03-13 11:36:06 +05:30

mxs-dma.c

dma: mxs-dma: enable channel in device_issue_pending call

2012-04-20 15:35:58 +05:30

pch_dma.c

dmaengine: add context parameter to prep_slave_sg and prep_dma_cyclic

2012-03-21 19:20:23 +05:30

pl330.c

dma: pl330: fix a couple of compilation warnings

2012-04-25 15:05:25 +05:30

sa11x0-dma.c

ARM: sa11x0: fix build errors from DMA engine API updates

2012-03-30 11:46:20 +01:00

shdma.c

dmaengine: add context parameter to prep_slave_sg and prep_dma_cyclic

2012-03-21 19:20:23 +05:30

shdma.h

dmaengine: move last completed cookie into generic dma_chan structure

2012-03-13 11:36:06 +05:30

sirf-dma.c

dmaengine: add context parameter to prep_slave_sg and prep_dma_cyclic

2012-03-21 19:20:23 +05:30

ste_dma40_ll.c

…

ste_dma40_ll.h

dma40: Improve the logic of stopping logical chan

2012-04-23 17:56:17 +05:30

ste_dma40.c

dma/ste_dma40: fix erroneous comparison

2012-04-23 18:07:05 +05:30

timb_dma.c

dmaengine: add context parameter to prep_slave_sg and prep_dma_cyclic

2012-03-21 19:20:23 +05:30

TODO

…

txx9dmac.c

dmaengine: add context parameter to prep_slave_sg and prep_dma_cyclic

2012-03-21 19:20:23 +05:30

txx9dmac.h

dmaengine: move last completed cookie into generic dma_chan structure

2012-03-13 11:36:06 +05:30