Merge branch 'dmaengine' into async-tx-next
authorDan Williams <dan.j.williams@intel.com>
Wed, 9 Sep 2009 00:55:21 +0000 (17:55 -0700)
committerDan Williams <dan.j.williams@intel.com>
Wed, 9 Sep 2009 00:55:21 +0000 (17:55 -0700)
commitbbb20089a3275a19e475dbc21320c3742e3ca423
tree216fdc1cbef450ca688135c5b8969169482d9a48
parent3e48e656903e9fd8bc805c6a2c4264d7808d315b
parent657a77fa7284d8ae28dfa48f1dc5d919bf5b2843
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
15 files changed:
arch/arm/include/asm/hardware/iop_adma.h
drivers/dma/Kconfig
drivers/dma/dmaengine.c
drivers/dma/dmatest.c
drivers/dma/ioat/dma.c
drivers/dma/ioat/dma.h
drivers/dma/ioat/dma_v2.c
drivers/dma/ioat/dma_v2.h
drivers/dma/ioat/pci.c
drivers/dma/iop-adma.c
drivers/md/Kconfig
drivers/md/raid5.c
drivers/md/raid5.h
include/linux/dmaengine.h
include/linux/pci_ids.h