Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 8 Jul 2018 18:29:14 +0000 (11:29 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 8 Jul 2018 18:29:14 +0000 (11:29 -0700)
commit124b99fb8018a7ac45558d8ab249ed758e14e618
tree6f915acee23e1b0aaefd27755c63c083936e13ef
parent70a2dc6abc8af028b0c71af6b3520574ee09e814
parent221e00d1fce976d8a04ff591a0150caf84e176f8
Merge branch 'linus' of git://git./linux/kernel/git/herbert/crypto-2.6

Pull crypto fixes from Herbert Xu:

 - add missing RETs in x86 aegis/morus

 - fix build error in arm speck

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: x86 - Add missing RETs
  crypto: arm/speck - fix building in Thumb2 mode