From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 10 Apr 2017 16:37:43 +0000 (-0700)
Subject: Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: v4.14-rc1~1154
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c08e611b7d0169b513e3b4515ffd51ac7f37f22c;p=platform%2Fkernel%2Flinux-rpi.git

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

Pull crypto fixes from Herbert Xu:
 "This fixes a number of bugs in the caam driver:

   - device creation fails after release

   - error-path NULL-pointer dereference

   - spurious hardware error in RNG deinstantiation"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: caam - fix RNG deinstantiation error checking
  crypto: caam - fix invalid dereference in caam_rsa_init_tfm()
  crypto: caam - fix JR platform device subsequent (re)creations
---

c08e611b7d0169b513e3b4515ffd51ac7f37f22c