diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-21 17:05:46 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-21 17:05:46 -0700 |
| commit | 1433ed4764cbb3582b4427cdbd81dda8f88e0da8 (patch) | |
| tree | 2828566ec3a07e4284d797f4757e351da5167149 /crypto/xts.c | |
| parent | dbb09f5191529d586f2d08ba3eeb85b692521742 (diff) | |
| parent | 1dd35fbd0bcabf756f77a32c93f97aab6001e33e (diff) | |
| download | linux-crypto-1433ed4764cbb3582b4427cdbd81dda8f88e0da8.tar.gz linux-crypto-1433ed4764cbb3582b4427cdbd81dda8f88e0da8.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: extend the control command to include an arg
async_tx: trim dma_async_tx_descriptor in 'no channel switch' case
DMAENGINE: DMA40 fix for allocation of logical channel 0
DMAENGINE: DMA40 support paused channel status
dmaengine: mpc512x: Use resource_size
DMA ENGINE: Do not reset 'private' of channel
ioat: Remove duplicated devm_kzalloc() calls for ioatdma_device
ioat3: disable cacheline-unaligned transfers for raid operations
ioat2,3: convert to producer/consumer locking
ioat: convert to circ_buf
DMAENGINE: Support for ST-Ericssons DMA40 block v3
async_tx: use of kzalloc/kfree requires the include of slab.h
dmaengine: provide helper for setting txstate
DMAENGINE: generic channel status v2
DMAENGINE: generic slave control v2
dma: timb-dma: Update comment and fix compiler warning
dma: Add timb-dma
DMAENGINE: COH 901 318 fix bytesleft
DMAENGINE: COH 901 318 rename confusing vars
Diffstat (limited to 'crypto/xts.c')
0 files changed, 0 insertions, 0 deletions