Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 28 Feb 2019 17:05:18 +0000 (09:05 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 28 Feb 2019 17:05:18 +0000 (09:05 -0800)
commit3f25a5990d9d32e8f77ce830b9ea6c0e4f4bea4b
treecd00b65c392211d908de709e30e9119218ca7e12
parent8ed0579c12b2fe56a1fac2f712f58fc26c1dc49b
parentc64316502008064c158fa40cc250665e461b0f2a
Merge branch 'linus' of git://git./linux/kernel/git/herbert/crypto-2.6

Pull crypto fixes from Herbert Xu:
 "This fixes a compiler warning introduced by a previous fix, as well as
  two crash bugs on ARM"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: sha512/arm - fix crash bug in Thumb2 build
  crypto: sha256/arm - fix crash bug in Thumb2 build
  crypto: ccree - add missing inline qualifier