]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-client.git/commitdiff
projects / ceph-client.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6e7bd3b 1358c13)
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)
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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.