From: Linus Torvalds 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: firefly_0821_release~22192 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b1c3c3ebf70548bb182d570b79a3f21045cd30e5;p=firefly-linux-kernel-4.4.55.git 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 --- b1c3c3ebf70548bb182d570b79a3f21045cd30e5