Merge 'crypto' from https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git (master) Merged-SHA: fd29be9b992511ff68d8a9c6f8a505d801e9f775 Documentation/ABI/testing/sysfs-driver-qat | 4 +- arch/arm/configs/am200epdkit_defconfig | 1 - arch/arm/configs/spitz_defconfig | 1 - arch/m68k/configs/amiga_defconfig | 1 - arch/m68k/configs/apollo_defconfig | 1 - arch/m68k/configs/atari_defconfig | 1 - arch/m68k/configs/bvme6000_defconfig | 1 - arch/m68k/configs/hp300_defconfig | 1 - arch/m68k/configs/mac_defconfig | 1 - arch/m68k/configs/multi_defconfig | 1 - arch/m68k/configs/mvme147_defconfig | 1 - arch/m68k/configs/mvme16x_defconfig | 1 - arch/m68k/configs/q40_defconfig | 1 - arch/m68k/configs/sun3_defconfig | 1 - arch/m68k/configs/sun3x_defconfig | 1 - arch/mips/configs/decstation_defconfig | 1 - arch/mips/configs/decstation_r4k_defconfig | 1 - arch/mips/configs/ip32_defconfig | 1 - arch/mips/configs/rt305x_defconfig | 1 - arch/mips/configs/xway_defconfig | 1 - arch/powerpc/configs/44x/eiger_defconfig | 1 - arch/powerpc/configs/44x/redwood_defconfig | 1 - arch/s390/configs/debug_defconfig | 1 - arch/s390/configs/defconfig | 1 - arch/sh/configs/sh2007_defconfig | 1 - arch/sh/configs/titan_defconfig | 1 - arch/sparc/configs/sparc32_defconfig | 1 - crypto/Kconfig | 13 ---- crypto/Makefile | 1 - crypto/arc4.c | 82 ---------------------- crypto/ecc.c | 11 ++- crypto/tcrypt.c | 19 ----- crypto/testmgr.c | 7 -- crypto/testmgr.h | 62 ---------------- drivers/char/hw_random/cctrng.c | 43 ++++++------ drivers/char/hw_random/mtk-rng.c | 2 +- drivers/char/hw_random/octeon-rng.c | 1 + drivers/crypto/atmel-i2c.c | 29 +++++--- drivers/crypto/caam/jr.c | 11 ++- .../crypto/intel/keembay/keembay-ocs-aes-core.c | 3 +- drivers/crypto/intel/keembay/keembay-ocs-ecc.c | 7 +- .../crypto/intel/qat/qat_420xx/adf_420xx_hw_data.c | 59 +++++++++++++++- .../crypto/intel/qat/qat_420xx/adf_420xx_hw_data.h | 6 ++ .../crypto/intel/qat/qat_common/adf_accel_engine.c | 5 +- .../crypto/intel/qat/qat_common/adf_cfg_services.c | 3 + .../crypto/intel/qat/qat_common/adf_cfg_services.h | 1 + .../crypto/intel/qat/qat_common/adf_common_drv.h | 2 +- drivers/crypto/intel/qat/qat_common/adf_init.c | 8 +-- include/crypto/arc4.h | 3 +- 49 files changed, 145 insertions(+), 263 deletions(-)