From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 13 Mar 2019 16:51:17 +0000 (-0700)
Subject: Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: v5.15~6780
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dac0bde43b0b3685390b68c9058bee36d4d5c747;p=platform%2Fkernel%2Flinux-starfive.git

Merge branch 'linus' of git://git./linux/kernel/git/herbert/crypto-2.6

Pull crypto fixes from Herbert Xu:
 "This fixes a bug in the newly added Exynos5433 AES code as well as an
  old one in the caam driver"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: caam - add missing put_device() call
  crypto: s5p-sss - fix AES support for Exynos5433
---

dac0bde43b0b3685390b68c9058bee36d4d5c747