Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 15 Jan 2020 18:21:34 +0000 (10:21 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 15 Jan 2020 18:21:34 +0000 (10:21 -0800)
commit0174cb6ce9449ce9b59cb9c6f4f64dc4df3de458
tree5c80c53b3bad9e2babd6ff4d303511f2e60b5cc7
parent84bf39461e61f69ebfbfecf39cfda71bf78a7fc1
parentcb1eeb75cf3dd84ced81333967200583993dfd73
Merge branch 'linus' of git://git./linux/kernel/git/herbert/crypto-2.6

Pull crypto fix from Herbert Xu:
 "This fixes a build problem for the hisilicon driver"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: hisilicon/sec2 - Use atomics instead of __sync