Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 20 Jan 2015 06:17:34 +0000 (18:17 +1200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 20 Jan 2015 06:17:34 +0000 (18:17 +1200)
commit2262889091c15ef0c790be0b99ea6dae73c86a0b
treecb3500bb32ffba36e9892c2dad98bda001ea65ca
parentb62a9c2058ee4c60677422fb7a8d6129320a4251
parent3e14dcf7cb80b34a1f38b55bc96f02d23fdaaaaf
Merge git://git./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