Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 2 Mar 2019 16:32:02 +0000 (08:32 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 2 Mar 2019 16:32:02 +0000 (08:32 -0800)
commitfa3294c58c58c4fa87ee0356b6cb1901db00533e
tree9611bf3eaaa4ab880fcc73f29d4f7d24d8bb3725
parenta215ce8f0e00c2d707080236f1aafec337371043
parentf86d17e9efe010b894db231329ee36b24bcc1b24
Merge branch 'linus' of git://git./linux/kernel/git/herbert/crypto-2.6

Pull more crypto fixes from Herbert Xu:
 "This fixes a couple of issues in arm64/chacha that was introduced in
  5.0"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: arm64/chacha - fix hchacha_block_neon() for big endian
  crypto: arm64/chacha - fix chacha_4block_xor_neon() for big endian