Dan Williams bbb20089a3 Merge branch 'dmaengine' into async-tx-next ...

Conflicts:
	crypto/async_tx/async_xor.c
	drivers/dma/ioat/dma_v2.h
	drivers/dma/ioat/pci.c
	drivers/md/raid5.c

2009-09-08 17:55:21 -07:00

..

ioat

Merge branch 'dmaengine' into async-tx-next

2009-09-08 17:55:21 -07:00

ipu

dma: fix ipu_idmac.c to not discard the last queued buffer

2009-05-12 14:41:48 -07:00

at_hdmac_regs.h

at_hdmac: implement a private tx_list

2009-09-08 17:53:03 -07:00

at_hdmac.c

dmaengine: Move all map_sg/unmap_sg for slave channel to its client

2009-09-08 17:53:05 -07:00

dmaengine.c

Merge branch 'dmaengine' into async-tx-next

2009-09-08 17:55:21 -07:00

dmatest.c

Merge branch 'dmaengine' into async-tx-next

2009-09-08 17:55:21 -07:00

dw_dmac_regs.h

dw_dmac: implement a private tx_list

2009-09-08 17:53:02 -07:00

dw_dmac.c

dmaengine: Move all map_sg/unmap_sg for slave channel to its client

2009-09-08 17:53:05 -07:00

fsldma.c

fsldma: Add DMA_SLAVE support

2009-09-08 17:53:04 -07:00

fsldma.h

fsldma: split apart external pause and request count features

2009-09-08 17:53:04 -07:00

iop-adma.c

Merge branch 'dmaengine' into async-tx-next

2009-09-08 17:55:21 -07:00

iovlock.c

net_dma: poll for a descriptor after allocation failure

2009-09-08 17:38:54 -07:00

Kconfig

Merge branch 'dmaengine' into async-tx-next

2009-09-08 17:55:21 -07:00

Makefile

Merge branch 'ioat' into dmaengine

2009-09-08 17:52:57 -07:00

mv_xor.c

mv_xor: implement a private tx_list

2009-09-08 17:53:03 -07:00

mv_xor.h

mv_xor: implement a private tx_list

2009-09-08 17:53:03 -07:00

txx9dmac.c

txx9dmac: implement a private tx_list

2009-09-08 17:53:03 -07:00

txx9dmac.h

txx9dmac: implement a private tx_list

2009-09-08 17:53:03 -07:00