From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 20 Jan 2015 06:17:34 +0000 (+1200)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=2262889091c15ef0c790be0b99ea6dae73c86a0b;p=people%2Fiwj%2Flinux.git

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

Pull crypto fix from Herbert Xu:
 "This fixes a regression that arose from the change to add a crypto
  prefix to module names which was done to prevent the loading of
  arbitrary modules through the Crypto API.

  In particular, a number of modules were missing the crypto prefix
  which meant that they could no longer be autoloaded"

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: add missing crypto module aliases
---

2262889091c15ef0c790be0b99ea6dae73c86a0b