]> git.baikalelectronics.ru Git - kernel.git/commitdiff
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 Nov 2021 20:35:46 +0000 (12:35 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 12 Nov 2021 20:35:46 +0000 (12:35 -0800)
Pull crypto fix from Herbert Xu:
 "This fixes a boot crash regression"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: api - Fix boot-up crash when crypto manager is disabled


Trivial merge