]> Git Repo - linux.git/commitdiff
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <[email protected]>
Thu, 9 Apr 2020 04:35:29 +0000 (21:35 -0700)
committerLinus Torvalds <[email protected]>
Thu, 9 Apr 2020 04:35:29 +0000 (21:35 -0700)
Pull crypto fixes from Herbert Xu:
 "This fixes a Kconfig dependency for hisilicon as well as a double free
  in marvell/octeontx"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: marvell/octeontx - fix double free of ptr
  crypto: hisilicon - Fix build error


Trivial merge
This page took 0.059011 seconds and 4 git commands to generate.