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)
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()

1  2 
crypto/hmac.c

diff --cc crypto/hmac.c
Simple merge