From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 26 Jun 2015 19:27:48 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a2f54be94f4cbce269bca6188d3fb4310c346fd1;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Merge git://git./linux/kernel/git/herbert/crypto-2.6

Pull crypto fixes from Herbert Xu:
 "This fixes the following issues:

   - move -O0 jitterentropy code into its own file instead of using gcc
     pragma magic.

   - kill testmgr warning for gcm-aes-aesni.

   - fix build failure in old rsa.

  Other minor fixes:

   - ignore asn1 files generated by new rsa.

   - remove unnecessary kzfree NULL checks in jitterentropy.

   - typo fix in akcipher"

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: rsa - add .gitignore for crypto/*.-asn1.[ch] files
  crypto: asymmetric_keys/rsa - Use non-conflicting variable name
  crypto: testmgr - don't print info about missing test for gcm-aes-aesni
  crypto: jitterentropy - Delete unnecessary checks before the function call "kzfree"
  crypto: akcipher - fix spelling cihper -> cipher
  crypto: jitterentropy - avoid compiler warnings
---

a2f54be94f4cbce269bca6188d3fb4310c346fd1