git://ftp.safe.ca / safe / jmp / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 60d9aa7 12458ea)
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 16 Dec 2009 18:28:56 +0000 (10:28 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 16 Dec 2009 18:28:56 +0000 (10:28 -0800)
* '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

1  2 
drivers/dma/Kconfig patch | diff1 | diff2 | blob | history
drivers/dma/shdma.c patch | diff1 | diff2 | blob | history

diff --cc drivers/dma/Kconfig
Simple merge
diff --cc drivers/dma/shdma.c
Simple merge
Full containers within linux kernel