commit b1881fb148a67a5b694ac9701672ce6b359abfa4
author Linus Torvalds <torvalds@linux-foundation.org> Thu Mar 13 13:17:25 2008 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Thu Mar 13 13:17:25 2008 -0700
tree 3c75d3cefe3c5d59304bc46c4782e7d52830aebf
parent ebe168d52c6255cfaf701b488e9e9ed0f548da19
parent 3280ab3e8815d60cea483d49b21261972e2785d6

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.