Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 30 May 2010 16:12:43 +0000 (09:12 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 30 May 2010 16:12:43 +0000 (09:12 -0700)
commite38c1e54ce51059a1aa8744c895762906cf43b32
tree6af00994b3d07da2db3419346f740ae06f3cfe7e
parent3e9345edd8562dc4f9bbca88a598c91c8779a9c4
parent7b8ddb06e54ad98edeb7951f317aee4d1feda9d6
Merge branch 'next' of git://git./linux/kernel/git/djbw/async_tx

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx:
  DMAENGINE: DMA40 U8500 platform configuration
  DMA: PL330: Add dma api driver