]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d7a0e1f 8d8002f)
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)
* '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.


Trivial merge
Linux 2.6 source tree