From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 27 May 2015 15:40:44 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: v4.9.8~4212
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c09b5cbd0d88317785de87bcdfe4052f9785c473;p=platform%2Fkernel%2Flinux-rpi3.git

Merge git://git./linux/kernel/git/herbert/crypto-2.6

Pull crypto fix from Herbert Xu:
 "This disables the newly (4.1) added user-space AEAD interface so that
  we can fix issues in the underlying kernel AEAD interface.  Once the
  new kernel AEAD interface is ready we can then reenable the user-space
  AEAD interface"

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: algif_aead - Disable AEAD user-space for now
---

c09b5cbd0d88317785de87bcdfe4052f9785c473