Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 Feb 2019 16:11:43 +0000 (08:11 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 Feb 2019 16:11:43 +0000 (08:11 -0800)
commit2aba322074de0d6781f4ae6b44d3e792b9bd2243
tree72deadea51742b353bbd77d575ecbf09d7415a1a
parent6e7bd3b5494620265d39463b9289b7ba872f6df1
parent1358c13a48c43f5e4de0c1835291837a27b9720c
Merge branch 'linus' of git://git./linux/kernel/git/herbert/crypto-2.6

Pull crypto fix from Herbert Xu:
 "This fixes a crash on resume in the ccree driver"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: ccree - fix resume race condition on init