From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 31 Aug 2016 16:42: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.8-rc5~24
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=071e31e254e0e0c438eecba3dba1d6e2d0da36c2;p=platform%2Fkernel%2Flinux-exynos.git

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

Pull crypto fixes from Herbert Xu:
 "This fixes the following issues:

   - Kconfig problem that prevented mxc-rnga from being enabled

   - bogus key sizes in qat aes-xts

   - buggy aes-xts code in vmx"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: vmx - fix null dereference in p8_aes_xts_crypt
  crypto: qat - fix aes-xts key sizes
  hwrng: mxc-rnga - Fix Kconfig dependency
---

071e31e254e0e0c438eecba3dba1d6e2d0da36c2