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)
commite0f14b8ca3882988d15f0b1b853ae3c29d8c9a83
tree126bf22ac19fbe7ef8b643b38adb440ff8d9be76
parentab9bb6318b0967671e0c9b6537c1537d51ca4f45
parent5871cd93692c8071fb9358daccb715b5081316ac
Merge branch 'linus' of git://git./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