Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 19 Mar 2008 04:34:48 +0000 (21:34 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 19 Mar 2008 04:34:48 +0000 (21:34 -0700)
commit264e3e889d86e552b4191d69bb60f4f3b383135a
treefde25f5a73c0ebbb1c19ab213270f0aa43ded9c7
parentd7a0e1f56472db0825e13f9dd39f0ad79b8c8b3e
parent8d8002f642886ae256a3c5d70fe8aff4faf3631a
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:
  async_tx: avoid the async xor_zero_sum path when src_cnt > device->max_xor
  fsldma: Fix the DMA halt when using DMA_INTERRUPT async_tx transfer.