]> 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)
commitf9123488580cbc42ec1ba10ffc9bab49cb1cc8c0
tree126bf22ac19fbe7ef8b643b38adb440ff8d9be76
parent4be23a3432458b4ac4aa9fe25e02bd0fc4c2f6fc
parent0916afca99b7071a4efd5b2ad008a524da77f43c
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