Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 6 Jun 2019 20:10:49 +0000 (13:10 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 6 Jun 2019 20:10:49 +0000 (13:10 -0700)
commitae8766042beee814c9e16e9ae1e84cd6eaa7ffaa
tree8b1932b18bcfb1856b27e32d326d500ccaad218b
parent01047631df813f6247185547c3778c80af088a20
parent7829a0c1cb9c80debfb4fdb49b4d90019f2ea1ac
Merge branch 'linus' of git://git./linux/kernel/git/herbert/crypto-2.6

Pull crypto fixes from Herbert Xu:
 "This fixes a regression that breaks the jitterentropy RNG and a
  potential memory leak in hmac"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: hmac - fix memory leak in hmac_init_tfm()
  crypto: jitterentropy - change back to module_init()
crypto/hmac.c