Linus Torvalds 5554b35933 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx ... * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx: (24 commits) I/OAT: I/OAT version 3.0 support I/OAT: tcp_dma_copybreak default value dependent on I/OAT version I/OAT: Add watchdog/reset functionality to ioatdma iop_adma: cleanup iop_chan_xor_slot_count iop_adma: document how to calculate the minimum descriptor pool size iop_adma: directly reclaim descriptors on allocation failure async_tx: make async_tx_test_ack a boolean routine async_tx: remove depend_tx from async_tx_sync_epilog async_tx: export async_tx_quiesce async_tx: fix handling of the "out of descriptor" condition in async_xor async_tx: ensure the xor destination buffer remains dma-mapped async_tx: list_for_each_entry_rcu() cleanup dmaengine: Driver for the Synopsys DesignWare DMA controller dmaengine: Add slave DMA interface dmaengine: add DMA_COMPL_SKIP_{SRC,DEST}_UNMAP flags to control dma unmap dmaengine: Add dma_client parameter to device_alloc_chan_resources dmatest: Simple DMA memcpy test client dmaengine: DMA engine driver for Marvell XOR engine iop-adma: fix platform driver hotplug/coldplug dmaengine: track the number of clients using a channel ... Fixed up conflict in drivers/dca/dca-sysfs.c manually		2008-07-23 12:03:18 -07:00
..
async_tx	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx	2008-07-23 12:03:18 -07:00
ablkcipher.c
aead.c
aes_generic.c
ahash.c
algapi.c
anubis.c
api.c
arc4.c
authenc.c
blkcipher.c
blowfish.c
camellia.c
cast5.c
cast6.c
cbc.c
ccm.c
chainiv.c
cipher.c
compress.c
crc32c.c
cryptd.c
crypto_null.c
cryptomgr.c
ctr.c
cts.c
deflate.c
des_generic.c
digest.c
ecb.c
eseqiv.c
fcrypt.c
gcm.c
gf128mul.c
hash.c
hmac.c
internal.h
Kconfig	Revert crypto: prng - Deterministic CPRNG	2008-07-15 23:46:24 +08:00
khazad.c
lrw.c
lzo.c
Makefile	Revert crypto: prng - Deterministic CPRNG	2008-07-15 23:46:24 +08:00
md4.c
md5.c
michael_mic.c
pcbc.c
proc.c
ripemd.h
rmd128.c
rmd160.c
rmd256.c
rmd320.c
salsa20_generic.c
scatterwalk.c
seed.c
seqiv.c
serpent.c
sha1_generic.c
sha256_generic.c
sha512_generic.c
tcrypt.c
tcrypt.h
tea.c
tgr192.c
twofish_common.c
twofish.c
wp512.c
xcbc.c
xor.c
xts.c