diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-30 16:46:31 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-30 16:46:31 -0700 |
commit | f7699b31f9d4e64946e52c56ef61b9faef940013 (patch) | |
tree | 917cbc551b971cd0637650b95882d97fac9a4b89 /crypto/krng.c | |
parent | e286091b2b21d1ff9166609cd19e0df62b56f4bc (diff) | |
parent | c0a16d573d49785fedcacf87328ac5257bcb70c0 (diff) | |
download | linux-crypto-f7699b31f9d4e64946e52c56ef61b9faef940013.tar.gz linux-crypto-f7699b31f9d4e64946e52c56ef61b9faef940013.zip |
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:
dmaengine: at_hdmac: add DMA slave transfers
dmaengine: at_hdmac: new driver for the Atmel AHB DMA Controller
dmaengine: dmatest: correct thread_count while using multiple thread per channel
dmaengine: dmatest: add a maximum number of test iterations
drivers/dma: Remove unnecessary semicolons
drivers/dma/fsldma.c: Remove unnecessary semicolons
dmaengine: move HIGHMEM64G restriction to ASYNC_TX_DMA
fsldma: do not clear bandwidth control bits on the 83xx controller
fsldma: enable external start for the 83xx controller
fsldma: use PCI Read Multiple command
Diffstat (limited to 'crypto/krng.c')
0 files changed, 0 insertions, 0 deletions