]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4fdf89a 035ba43)
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 9 Apr 2020 04:35:29 +0000 (21:35 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 9 Apr 2020 04:35:29 +0000 (21:35 -0700)
commita972838cd6a521793b4d2f9e714ccb93d4b7dd71
tree1e8986eb065387f51a1312ab4f013d3d4f0ebdcatree | snapshot
parent4fdf89abc1cab4dafa9acbf08b144c0fe626ce14commit | diff
parent035ba43019d4ea7357e95c72e5cf5415acea4264commit | diff
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

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
Linux Kernel Source Tree.