commit 7949456b1b96924c2d9ae5aea5fa7d4c81c946ed
author Linus Torvalds <torvalds@linux-foundation.org> Wed Dec 16 10:28:56 2009 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> Wed Dec 16 10:28:56 2009 -0800
tree 819e64dcd686c8b53c698c164aea96a002e8b5f8
parent 60d9aa758c00f20ade0cb1951f6a934f628dd2d7
parent 12458ea06efd7b44281e68fe59c950ec7d59c649

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:
  ppc440spe-adma: adds updated ppc440spe adma driver
  iop-adma.c: use resource_size()
  dmaengine: clarify the meaning of the DMA_CTRL_ACK flag
  sh: stylistic improvements for the DMA driver
  dmaengine: fix dmatest to verify minimum transfer length and test buffer size
  sh: DMA driver has to specify its alignment requirements
  Add COH 901 318 DMA block driver v5