tree 3c3ace81c2132aaf13223df10c4491c38a46c976
parent 69098bac169d630a777b362470f20451b9446e39
parent a06d568f7c5e40e34ea64881842deb8f4382babf
author Linus Torvalds <torvalds@linux-foundation.org> 1229630753 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1229630753 -0800

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx:
  async_xor: dma_map destination DMA_BIDIRECTIONAL
  dmaengine: protect 'id' from concurrent registrations
  ioat: wait for self-test completion