tree 84b80c025132e7d4619709dd9134681c8b014fa2
parent a1cf11d8f673a3ad91012c5da96beed06ecefde1
parent 8f33d5277fada0291ea495f7fd44a3e7b7aa41d3
author Linus Torvalds <torvalds@linux-foundation.org> 1294084134 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1294084134 -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:
  dmaengine: provide dummy functions for DMA_ENGINE=n
  mv_xor: fix race in tasklet function