tree 216fdc1cbef450ca688135c5b8969169482d9a48
parent 3e48e656903e9fd8bc805c6a2c4264d7808d315b
parent 657a77fa7284d8ae28dfa48f1dc5d919bf5b2843
author Dan Williams <dan.j.williams@intel.com> 1252457721 -0700
committer Dan Williams <dan.j.williams@intel.com> 1252457721 -0700

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