Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 3 Jan 2011 19:48:54 +0000 (11:48 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 3 Jan 2011 19:48:54 +0000 (11:48 -0800)
commitd45fa563a62c908d0e9a581d4f091fed6371ebd0
tree84b80c025132e7d4619709dd9134681c8b014fa2
parenta1cf11d8f673a3ad91012c5da96beed06ecefde1
parent8f33d5277fada0291ea495f7fd44a3e7b7aa41d3
Merge branch 'fixes' of git://git./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