Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 12 Jan 2018 17:47:58 +0000 (09:47 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 12 Jan 2018 17:47:58 +0000 (09:47 -0800)
Pull crypto fix from Herbert Xu:
 "This fixes a NULL pointer dereference in crypto_remove_spawns that can
  be triggered through af_alg"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: algapi - fix NULL dereference in crypto_remove_spawns()


Trivial merge