]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 31 Aug 2019 01:56:08 +0000 (18:56 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 31 Aug 2019 01:56:08 +0000 (18:56 -0700)
commitc512e5043b907c444fc05968462eb1c6df635009
tree126bf22ac19fbe7ef8b643b38adb440ff8d9be76
parentbbcfc4ec702aa1dbba8fac1c3005f0ea68dbdced
parent2d39f4e605ec2a8288a1b75fc79aea69da85c4cf
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Pull crypto fix from Herbert Xu:
 "Fix a potential crash in the ccp driver"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: ccp - Ignore unconfigured CCP device on suspend/resume
drivers/crypto/ccp/ccp-dev.c