From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 19 Mar 2008 04:34:48 +0000 (-0700)
Subject: Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
X-Git-Tag: v2.6.25-rc7~100
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=264e3e889d86e552b4191d69bb60f4f3b383135a;p=linux-2.6-omap-h63xx.git

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_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.
---

264e3e889d86e552b4191d69bb60f4f3b383135a