Linus Torvalds
5115f3c19d
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
...
Pull slave-dmaengine updates from Vinod Koul:
"This is fairly big pull by my standards as I had missed last merge
window. So we have the support for device tree for slave-dmaengine,
large updates to dw_dmac driver from Andy for reusing on different
architectures. Along with this we have fixes on bunch of the drivers"
Fix up trivial conflicts, usually due to #include line movement next to
each other.
* 'next' of git://git.infradead.org/users/vkoul/slave-dma: (111 commits)
Revert "ARM: SPEAr13xx: Pass DW DMAC platform data from DT"
ARM: dts: pl330: Add #dma-cells for generic dma binding support
DMA: PL330: Register the DMA controller with the generic DMA helpers
DMA: PL330: Add xlate function
DMA: PL330: Add new pl330 filter for DT case.
dma: tegra20-apb-dma: remove unnecessary assignment
edma: do not waste memory for dma_mask
dma: coh901318: set residue only if dma is in progress
dma: coh901318: avoid unbalanced locking
dmaengine.h: remove redundant else keyword
dma: of-dma: protect list write operation by spin_lock
dmaengine: ste_dma40: do not remove descriptors for cyclic transfers
dma: of-dma.c: fix memory leakage
dw_dmac: apply default dma_mask if needed
dmaengine: ioat - fix spare sparse complain
dmaengine: move drivers/of/dma.c -> drivers/dma/of-dma.c
ioatdma: fix race between updating ioat->head and IOAT_COMPLETION_PENDING
dw_dmac: add support for Lynxpoint DMA controllers
dw_dmac: return proper residue value
dw_dmac: fill individual length of descriptor
...
2013-02-26 09:24:48 -08:00
..
asymmetric_keys
X.509: Convert some printk calls to pr_devel
2012-10-10 20:06:38 +10:30
async_tx
async_tx: fix checking of dma_wait_for_async_tx() return value
2013-01-07 22:05:12 -08:00
842.c
crypto: 842 - remove .cra_list initialization
2012-09-07 04:17:06 +08:00
ablkcipher.c
crypto: user - fix info leaks in report API
2013-02-19 20:27:03 +08:00
aead.c
crypto: user - fix info leaks in report API
2013-02-19 20:27:03 +08:00
aes_generic.c
crypto: cleanup - remove unneeded crypto_alg.cra_list initializations
2012-08-01 17:47:27 +08:00
af_alg.c
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
ahash.c
crypto: user - fix info leaks in report API
2013-02-19 20:27:03 +08:00
algapi.c
crypto: use ERR_CAST
2013-02-04 21:16:53 +08:00
algboss.c
crypto: algapi - Fix hang on crypto allocation
2012-06-27 20:59:12 +08:00
algif_hash.c
algif_skcipher.c
ansi_cprng.c
crypto: ansi_cprng - use crypto_[un]register_algs
2012-08-01 17:47:25 +08:00
anubis.c
crypto: cleanup - remove unneeded crypto_alg.cra_list initializations
2012-08-01 17:47:27 +08:00
api.c
arc4.c
crypto: arc4 - improve performance by using u32 for ctx and variables
2012-06-14 10:07:23 +08:00
authenc.c
crypto: use ERR_CAST
2013-02-04 21:16:53 +08:00
authencesn.c
crypto: use ERR_CAST
2013-02-04 21:16:53 +08:00
blkcipher.c
crypto: user - fix info leaks in report API
2013-02-19 20:27:03 +08:00
blowfish_common.c
crypto: blowfish - split generic and common c code
2011-09-22 21:25:25 +10:00
blowfish_generic.c
crypto: cleanup - remove unneeded crypto_alg.cra_list initializations
2012-08-01 17:47:27 +08:00
camellia_generic.c
crypto: cleanup - remove unneeded crypto_alg.cra_list initializations
2012-08-01 17:47:27 +08:00
cast5_generic.c
crypto: cast5/cast6 - move lookup tables to shared module
2012-12-06 17:16:26 +08:00
cast6_generic.c
crypto: cast5/cast6 - move lookup tables to shared module
2012-12-06 17:16:26 +08:00
cast_common.c
crypto: cast5/cast6 - move lookup tables to shared module
2012-12-06 17:16:26 +08:00
cbc.c
ccm.c
crypto: use ERR_CAST
2013-02-04 21:16:53 +08:00
chainiv.c
crypto: use ERR_CAST
2013-02-04 21:16:53 +08:00
cipher.c
compress.c
crc32.c
crypto: crc32 - add crc32 pclmulqdq implementation and wrappers for table implementation
2013-01-20 10:16:45 +11:00
crc32c.c
crypto: crc32c should use library implementation
2012-03-23 16:58:38 -07:00
cryptd.c
crypto: cryptd - disable softirqs in cryptd_queue_worker to prevent data corruption
2012-10-24 21:21:18 +08:00
crypto_null.c
crypto: crypto_null - use crypto_[un]register_algs
2012-08-01 17:47:24 +08:00
crypto_user.c
crypto: user - ensure user supplied strings are nul-terminated
2013-02-19 20:27:04 +08:00
crypto_wq.c
crypto: add module.h to those files that are explicitly using it
2011-10-31 19:31:11 -04:00
ctr.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2013-02-25 15:56:15 -08:00
cts.c
crypto: use ERR_CAST
2013-02-04 21:16:53 +08:00
deflate.c
crypto: cleanup - remove unneeded crypto_alg.cra_list initializations
2012-08-01 17:47:27 +08:00
des_generic.c
crypto: des - use crypto_[un]register_algs
2012-08-01 17:47:24 +08:00
ecb.c
eseqiv.c
fcrypt.c
crypto: cleanup - remove unneeded crypto_alg.cra_list initializations
2012-08-01 17:47:27 +08:00
fips.c
gcm.c
crypto: use ERR_CAST
2013-02-04 21:16:53 +08:00
gf128mul.c
ghash-generic.c
crypto: cleanup - remove unneeded crypto_alg.cra_list initializations
2012-08-01 17:47:27 +08:00
hmac.c
internal.h
crypto: algapi - Move larval completion into algboss
2012-06-22 20:08:29 +08:00
Kconfig
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2013-02-25 15:56:15 -08:00
khazad.c
crypto: cleanup - remove unneeded crypto_alg.cra_list initializations
2012-08-01 17:47:27 +08:00
krng.c
crypto: cleanup - remove unneeded crypto_alg.cra_list initializations
2012-08-01 17:47:27 +08:00
lrw.c
crypto: lrw - add interface for parallelized cipher implementions
2011-11-09 11:50:31 +08:00
lzo.c
crypto: cleanup - remove unneeded crypto_alg.cra_list initializations
2012-08-01 17:47:27 +08:00
Makefile
crypto: crc32 - add crc32 pclmulqdq implementation and wrappers for table implementation
2013-01-20 10:16:45 +11:00
md4.c
crypto: add module.h to those files that are explicitly using it
2011-10-31 19:31:11 -04:00
md5.c
crypto: Move md5_transform to lib/md5.c
2011-08-06 18:32:45 -07:00
michael_mic.c
pcbc.c
pcompress.c
crypto: user - fix info leaks in report API
2013-02-19 20:27:03 +08:00
pcrypt.c
crypto: pcrypt - Use the online cpumask as the default
2012-03-29 19:52:47 +08:00
proc.c
crypto: add module.h to those files that are explicitly using it
2011-10-31 19:31:11 -04:00
ripemd.h
rmd128.c
rmd160.c
rmd256.c
rmd320.c
rng.c
crypto: user - fix info leaks in report API
2013-02-19 20:27:03 +08:00
salsa20_generic.c
crypto: cleanup - remove unneeded crypto_alg.cra_list initializations
2012-08-01 17:47:27 +08:00
scatterwalk.c
crypto: remove the second argument of k[un]map_atomic()
2012-03-20 21:48:16 +08:00
seed.c
crypto: cleanup - remove unneeded crypto_alg.cra_list initializations
2012-08-01 17:47:27 +08:00
seqiv.c
crypto: use ERR_CAST
2013-02-04 21:16:53 +08:00
serpent_generic.c
crypto: serpent - use crypto_[un]register_algs
2012-08-01 17:47:25 +08:00
sha1_generic.c
crypto: sha1 - export sha1_update for reuse
2011-08-10 19:00:28 +08:00
sha256_generic.c
crypto: sha256 - use crypto_[un]register_shashes
2012-08-01 17:47:26 +08:00
sha512_generic.c
crypto: sha512 - use crypto_[un]register_shashes
2012-08-01 17:47:26 +08:00
shash.c
crypto: user - fix info leaks in report API
2013-02-19 20:27:03 +08:00
tcrypt.c
crypto: ctr - make rfc3686 asynchronous block cipher
2013-01-08 07:03:04 +01:00
tcrypt.h
crypto: ctr - make rfc3686 asynchronous block cipher
2013-01-08 07:03:04 +01:00
tea.c
crypto: tea - use crypto_[un]register_algs
2012-08-01 17:47:24 +08:00
testmgr.c
crypto: testmgr - add test vector for fcrypt
2013-01-20 10:16:47 +11:00
testmgr.h
crypto: testmgr - remove superfluous initializers for xts(aes)
2012-12-06 17:16:29 +08:00
tgr192.c
crypto: tiger - use crypto_[un]register_shashes
2012-08-01 17:47:26 +08:00
twofish_common.c
crypto: twofish-x86_64-3way - add lrw support
2011-11-09 11:53:32 +08:00
twofish_generic.c
crypto: cleanup - remove unneeded crypto_alg.cra_list initializations
2012-08-01 17:47:27 +08:00
vmac.c
crypto: vmac - Make VMAC work when blocks aren't aligned
2012-10-15 22:33:20 +08:00
wp512.c
crypto: whirlpool - use crypto_[un]register_shashes
2012-08-01 17:47:27 +08:00
xcbc.c
crypto: add module.h to those files that are explicitly using it
2011-10-31 19:31:11 -04:00
xor.c
add further __init annotations to crypto/xor.c
2012-10-11 13:42:32 +11:00
xts.c
crypto: xts: add interface for parallelized cipher implementations
2011-11-09 11:56:06 +08:00
zlib.c