From: Linus Torvalds Date: Fri, 18 Apr 2008 15:38:55 +0000 (-0700) Subject: Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx X-Git-Tag: v2.6.26-rc1~1149 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=07fe944e87d79f8d7e1b090913fe9f2ace78f41d;p=linux-2.6-omap-h63xx.git Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx: dmaengine: ack to flags: make use of the unused bits in the 'ack' field iop-adma: remove the workaround for missed interrupts on iop3xx async_tx: kill ->device_dependency_added async_tx: fix multiple dependency submission fsldma: Split the MPC83xx event from MPC85xx and refine irq codes. fsldma: Remove CONFIG_FSL_DMA_SELFTEST, keep fsl_dma_self_test() running always. --- 07fe944e87d79f8d7e1b090913fe9f2ace78f41d