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)
commit0bb78166dfda3d4ff07dd4bd04caa6244a867927
treee5aac9b29b2d46d8475e1dd51f9fd775d9c94721
parenta638af00b27266c09ab7ac69141e6f4ac6c00eff
parentc927b080c67e3e97193c81fc1d27f4251bf4e036
Merge branch 'linus' of git://git./linux/kernel/git/herbert/crypto-2.6

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