From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 8 Jul 2018 18:29:14 +0000 (-0700)
Subject: Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: v4.18-rc4~6
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=124b99fb8018a7ac45558d8ab249ed758e14e618;p=linux-2.6-block.git

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
---

124b99fb8018a7ac45558d8ab249ed758e14e618