]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitfff65c8adc31e0efd75ee44f9308cc043eec6148
tree6f915acee23e1b0aaefd27755c63c083936e13ef
parentec1277a61eebef9991d254f5b3b4ef2fb55153b1
parent5ea685812dc3589171ec3a5ae0bf67b1791bd3fd
Merge branch 'linus' of git://git.kernel.org/pub/scm/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