From: Linus Torvalds Date: Wed, 13 May 2009 00:12:36 +0000 (-0700) Subject: Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx X-Git-Tag: firefly_0821_release~14184 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=bd99f5e17b317a6d342ffaf500e2a9fd632d2a22;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: dma: fix ipu_idmac.c to not discard the last queued buffer ioatdma: fix "ioatdma frees DMA memory with wrong function" ipu_idmac: Use disable_irq_nosync() from within irq handlers. dmatest: fix max channels handling --- bd99f5e17b317a6d342ffaf500e2a9fd632d2a22