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

..

dca.c

ioat: ___devinit annotate the initialization paths

2009-09-08 17:30:24 -07:00

dma_v2.c

Merge branch 'dmaengine' into async-tx-next

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

dma_v2.h

Merge branch 'dmaengine' into async-tx-next

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

dma_v3.c

ioat3: segregate raid engines

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

dma.c

Merge branch 'dmaengine' into async-tx-next

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

dma.h

Merge branch 'dmaengine' into async-tx-next

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

hw.h

ioat3: hardware version 3.2 register / descriptor definitions

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

Makefile

ioat3: split ioat3 support to its own file, add memset

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

pci.c

Merge branch 'dmaengine' into async-tx-next

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

registers.h

ioat3: xor support

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