summaryrefslogtreecommitdiffstats
path: root/crypto/camellia.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-12-30 22:46:29 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-30 22:46:29 +0100
commit05a625486efc3209ae4d98e253dafa6ce0124385 (patch)
treeb78b4a854639fecc91598ecb05900c929a6ab85e /crypto/camellia.c
parentMerge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tyt... (diff)
parentMerge branch 'ioat' into fixes (diff)
downloadlinux-05a625486efc3209ae4d98e253dafa6ce0124385.tar.xz
linux-05a625486efc3209ae4d98e253dafa6ce0124385.zip
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx: drivers/dma: Correct use after free drivers/dma: drop unnecesary memset ioat2,3: put channel hardware in known state at init async_tx: expand async raid6 test to cover ioatdma corner case ioat3: fix p-disabled q-continuation sh: fix DMA driver's descriptor chaining and cookie assignment dma: at_hdmac: correct incompatible type for argument 1 of 'spin_lock_bh'
Diffstat (limited to 'crypto/camellia.c')
0 files changed, 0 insertions, 0 deletions