Merge remote-tracking branch 'crypto/master'

Conflicts:
	crypto/Kconfig

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/Makefile
Simple merge

diff --cc arch/powerpc/configs/ppc64_defconfig
Simple merge

diff --cc arch/powerpc/configs/pseries_defconfig
Simple merge

diff --cc arch/powerpc/kernel/prom_init.c
Simple merge

diff --cc crypto/Kconfig
index 94f232f96d036da6827a6b50c1f46379ff75f840,27307981f88efed5c9dbb9d328616a6f2220fdfb..8a197304b41560eaec7aa4da11356f6b17fda96d
--- 1/crypto/Kconfig
--- 2/crypto/Kconfig
+++ b/crypto/Kconfig
@@@ -451,15 -433,15 +451,24 @@@ config CRYPTO_SHA1_SSSE
          using Supplemental SSE3 (SSSE3) instructions or Advanced Vector
          Extensions (AVX), when available.
  
+ config CRYPTO_SHA1_ARM
+       tristate "SHA1 digest algorithm (ARM-asm)"
+       depends on ARM
+       select CRYPTO_SHA1
+       select CRYPTO_HASH
+       help
+         SHA-1 secure hash standard (FIPS 180-1/DFIPS 180-2) implemented
+         using optimized ARM assembler.
+ 
 +config CRYPTO_SHA1_SPARC64
 +      tristate "SHA1 digest algorithm (SPARC64)"
 +      depends on SPARC64
 +      select CRYPTO_SHA1
 +      select CRYPTO_HASH
 +      help
 +        SHA-1 secure hash standard (FIPS 180-1/DFIPS 180-2) implemented
 +        using sparc64 crypto instructions, when available.
 +
  config CRYPTO_SHA256
        tristate "SHA224 and SHA256 digest algorithm"
        select CRYPTO_HASH
@@@ -633,34 -599,30 +644,58 @@@ config CRYPTO_AES_NI_INTE
          ECB, CBC, LRW, PCBC, XTS. The 64 bit version has additional
          acceleration for CTR.
  
+ config CRYPTO_AES_ARM
+       tristate "AES cipher algorithms (ARM-asm)"
+       depends on ARM
+       select CRYPTO_ALGAPI
+       select CRYPTO_AES
+       help
+         Use optimized AES assembler routines for ARM platforms.
+ 
+         AES cipher algorithms (FIPS-197). AES uses the Rijndael
+         algorithm.
+ 
+         Rijndael appears to be consistently a very good performer in
+         both hardware and software across a wide range of computing
+         environments regardless of its use in feedback or non-feedback
+         modes. Its key setup time is excellent, and its key agility is
+         good. Rijndael's very low memory requirements make it very well
+         suited for restricted-space environments, in which it also
+         demonstrates excellent performance. Rijndael's operations are
+         among the easiest to defend against power and timing attacks.
+ 
+         The AES specifies three key sizes: 128, 192 and 256 bits
+ 
+         See <http://csrc.nist.gov/encryption/aes/> for more information.
+ 
 +config CRYPTO_AES_SPARC64
 +      tristate "AES cipher algorithms (SPARC64)"
 +      depends on SPARC64
 +      select CRYPTO_CRYPTD
 +      select CRYPTO_ALGAPI
 +      help
 +        Use SPARC64 crypto opcodes for AES algorithm.
 +
 +        AES cipher algorithms (FIPS-197). AES uses the Rijndael
 +        algorithm.
 +
 +        Rijndael appears to be consistently a very good performer in
 +        both hardware and software across a wide range of computing
 +        environments regardless of its use in feedback or non-feedback
 +        modes. Its key setup time is excellent, and its key agility is
 +        good. Rijndael's very low memory requirements make it very well
 +        suited for restricted-space environments, in which it also
 +        demonstrates excellent performance. Rijndael's operations are
 +        among the easiest to defend against power and timing attacks.
 +
 +        The AES specifies three key sizes: 128, 192 and 256 bits
 +
 +        See <http://csrc.nist.gov/encryption/aes/> for more information.
 +
 +        In addition to AES cipher algorithm support, the acceleration
 +        for some popular block cipher mode is supported too, including
 +        ECB and CBC.
 +
  config CRYPTO_ANUBIS
        tristate "Anubis cipher algorithm"
        select CRYPTO_ALGAPI

diff --cc crypto/crypto_user.c
Simple merge

diff --cc drivers/crypto/caam/key_gen.c
Simple merge