]> git.baikalelectronics.ru Git - kernel.git/commitdiff
projects / kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bbcfc4e 2d39f4e)
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)
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

1  2 
drivers/crypto/ccp/ccp-dev.c patch | diff1 | diff2 | blob | history

diff --cc drivers/crypto/ccp/ccp-dev.c
Simple merge
Linux Kernel Source Tree.