Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 23 Feb 2018 00:38:10 +0000 (16:38 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 23 Feb 2018 00:38:10 +0000 (16:38 -0800)
Pull crypto fix from Herbert Xu:
 "Fix an oops in the s5p-sss driver when used with ecb(aes)"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: s5p-sss - Fix kernel Oops in AES-ECB mode


Trivial merge