From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 13 Mar 2008 20:17:25 +0000 (-0700)
Subject: Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
X-Git-Tag: v2.6.25-rc6~16
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=b1881fb148a67a5b694ac9701672ce6b359abfa4;p=linux-2.6-omap-h63xx.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:
  async_tx: checkpatch says s/__FUNCTION__/__func__/g
  iop-adma.c: replace remaining __FUNCTION__ occurrences
  fsldma: Add a completed cookie updated action in DMA finish interrupt.
  fsldma: Add device_prep_dma_interrupt support to fsldma.c
  dmaengine: Fix a bug about BUG_ON() on DMA engine capability DMA_INTERRUPT.
  fsldma: Fix fsldma.c warning messages when it's compiled under PPC64.
---

b1881fb148a67a5b694ac9701672ce6b359abfa4