Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 4 Mar 2008 19:26:01 +0000 (11:26 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 4 Mar 2008 19:26:01 +0000 (11:26 -0800)
commitb1c3c3ebf70548bb182d570b79a3f21045cd30e5
treead70af0d0fa33b737ff1ae28e59761865b24bdae
parent87baa2bb904ed46f872385fe430b6cfb80967835
parent6497dcffe07b7c3d863f9899280c4f6eae999161
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:
  ioat: fix 'ack' handling, driver must ensure that 'ack' is zero
  dmaengine: fix sparse warning
  fsldma: do not cleanup descriptors in hardirq context
  dmaengine: add driver for Freescale MPC85xx DMA controller