Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 Sep 2016 18:10:49 +0000 (11:10 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 Sep 2016 18:10:49 +0000 (11:10 -0700)
Pull crypto bugfix from Herbert Xu:
 "Fix a bug in the cryptd code that may lead to crashes"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: cryptd - initialize child shash_desc on import


Trivial merge