tree b60236afef24712752b2560d92b4e5578a95e071
parent 6741897602aabae6542631cafbd2616943acc735
parent a8348bca2944d397a528772f5c0ccb47a8b58af4
author Linus Torvalds <torvalds@linux-foundation.org> 1479582945 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1479582945 -0800

Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

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

   - Compiler warning in caam driver that was the last one remaining

   - Do not register aes-xts in caam drivers on unsupported platforms

   - Regression in algif_hash interface that may lead to an oops"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: algif_hash - Fix NULL hash crash with shash
  crypto: caam - fix type mismatch warning
  crypto: caam - do not register AES-XTS mode on LP units