From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 11 Sep 2012 23:14:17 +0000 (+0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: v3.6-rc6~31
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=274a2f5ddb3e8bf67e561574e6529a65a4039240;p=cascardo%2Flinux.git

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

Pull crypto fixes from Herbert Xu:
 "This fixes the authenc self-test crash as well as a missing export of
  a symbol used by a module."

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: authenc - Fix crash with zero-length assoc data
  crypto/caam: Export gen_split_key symbol for other modules
---

274a2f5ddb3e8bf67e561574e6529a65a4039240