diff options
| author | Mark Brown <broonie@kernel.org> | 2015-03-03 09:36:44 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-03-03 09:36:44 +0000 |
| commit | a0d6a47ed69978c84ba8859c3cdbbbd04e79eb2d (patch) | |
| tree | 30cf64632dd0c25fb07c1ab8dd590efa6991f1a3 /crypto | |
| parent | 3af2dae32ca1108e47a435eaeec276a1c8289a36 (diff) | |
| parent | 413cb08cebe9fd8107f556eee48b2d40773cacde (diff) | |
Merge tag 'v3.14.34' into linux-linaro-lsk-v3.14
This is the 3.14.34 stable release
Conflicts:
arch/arm64/kernel/setup.c
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/crc32c.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/crypto/crc32c.c b/crypto/crc32c.c index 06f7018c9d95..238f0e627ef3 100644 --- a/crypto/crc32c.c +++ b/crypto/crc32c.c @@ -170,3 +170,4 @@ module_exit(crc32c_mod_fini); MODULE_AUTHOR("Clay Haapala <chaapala@cisco.com>"); MODULE_DESCRIPTION("CRC32c (Castagnoli) calculations wrapper for lib/crc32c"); MODULE_LICENSE("GPL"); +MODULE_ALIAS_CRYPTO("crc32c"); |