summaryrefslogtreecommitdiffstats
path: root/crypto/sha256_generic.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-02-02 08:41:02 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-02-02 08:41:02 -0800
commit178cf7de6f1d3b95407f5a76af249fc924d42576 (patch)
tree4b3e5f3ef6dfa7866fb30811acdc60832a055269 /crypto/sha256_generic.c
parent89c468263befb4617aaab36ae8c54ba04164c7b0 (diff)
parente36f014edff70fc02b3d3d79cead1d58f289332e (diff)
downloadlinux-178cf7de6f1d3b95407f5a76af249fc924d42576.tar.bz2
Merge 3.19-rc7 into staging-next
We want those fixes in here for testing. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'crypto/sha256_generic.c')
-rw-r--r--crypto/sha256_generic.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/sha256_generic.c b/crypto/sha256_generic.c
index 5eb21b120033..b001ff5c2efc 100644
--- a/crypto/sha256_generic.c
+++ b/crypto/sha256_generic.c
@@ -385,4 +385,6 @@ MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("SHA-224 and SHA-256 Secure Hash Algorithm");
MODULE_ALIAS_CRYPTO("sha224");
+MODULE_ALIAS_CRYPTO("sha224-generic");
MODULE_ALIAS_CRYPTO("sha256");
+MODULE_ALIAS_CRYPTO("sha256-generic");