From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 4 Mar 2008 19:26:01 +0000 (-0800)
Subject: Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
X-Git-Tag: Ubuntu-5.0.0-8.9~35490
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=b1c3c3ebf70548bb182d570b79a3f21045cd30e5;p=mirror_ubuntu-disco-kernel.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:
  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
---

b1c3c3ebf70548bb182d570b79a3f21045cd30e5