From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 18 Mar 2015 18:10:41 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: omap-for-v4.1/fixes-rc1~308
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec3fbff0302e219997d48117fcb1fd04b8ad97c6;p=pandora-kernel.git

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

Pull crypto fixes from Herbert Xu:
 "Fix a bug in the ARM XTS implementation that can cause failures in
  decrypting encrypted disks, and fix is a memory overwrite bug that can
  cause a crash which can be triggered from userspace"

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: aesni - fix memory usage in GCM decryption
  crypto: arm/aes update NEON AES module to latest OpenSSL version
---

ec3fbff0302e219997d48117fcb1fd04b8ad97c6
Reading git-diff-tree failed