From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Thu, 16 Feb 2012 04:18:21 +0000 (+0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: v3.4-rc1~166^2~15
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=d97055e62dd8c6f2150b6062ffbd4a6d836658ff;p=~emulex%2Finfiniband.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Merge crypto tree as it has cherry-picked the ror64 patch from cryptodev.
---

d97055e62dd8c6f2150b6062ffbd4a6d836658ff