Herbert Xu 02c0241b60 Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto ...

Merge crypto to resolve conflict in crypto/Kconfig.

2013-06-21 15:13:27 +08:00

..

caamalg.c

crypto: caam - fix inconsistent assoc dma mapping direction

2013-05-14 10:37:57 +08:00

caamhash.c

crypto: caam - change key gen functions to return signed int

2013-04-25 21:01:43 +08:00

caamrng.c

crypto: caam - set descriptor sharing type to SERIAL

2012-08-01 17:47:31 +08:00

compat.h

Revert "crypto: caam - add IPsec ESN support"

2013-03-21 17:36:03 +08:00

ctrl.c

crypto: caam - FIX RNG init for RNG greater than equal to 4

2013-05-14 10:14:51 +08:00

ctrl.h

crypto: caam - ERA retrieval and printing for SEC device

2012-07-11 11:06:11 +08:00

desc_constr.h

crypto: caam - Add new macros for building extended SEC descriptors (> 64 words)

2013-05-28 15:37:07 +08:00

desc.h

crypto: caam - add missing flag for the LOAD/STORE commands

2013-05-28 15:37:08 +08:00

error.c

crypto: caam - static constify error data

2013-04-25 21:01:43 +08:00

error.h

crypto: caam - fix printk recursion for long error texts

2011-05-04 15:15:06 +10:00

intern.h

crypto: caam - fix job ring cleanup code

2013-04-25 21:09:07 +08:00

jr.c

crypto: caam - fix job ring cleanup code

2013-04-25 21:09:07 +08:00

jr.h

…

Kconfig

crypto: caam - fix typo "CRYPTO_AHASH"

2013-03-10 18:16:36 +08:00

key_gen.c

crypto: caam - change key gen functions to return signed int

2013-04-25 21:01:43 +08:00

key_gen.h

crypto: caam - change key gen functions to return signed int

2013-04-25 21:01:43 +08:00

Makefile

crypto: caam - hwrng support

2012-06-27 14:42:06 +08:00

pdb.h

crypto: caam - Add define for Adjust Output Frame Length in PDB

2013-05-28 15:37:08 +08:00

regs.h

crypto: caam - FIX RNG init for RNG greater than equal to 4

2013-05-14 10:14:51 +08:00

sg_sw_sec4.h

crypto: caam - chaining support

2012-06-27 14:42:05 +08:00