diff options
| author | Stefan Agner <stefan.agner@toradex.com> | 2015-02-02 13:38:03 +0100 |
|---|---|---|
| committer | Stefan Agner <stefan.agner@toradex.com> | 2015-02-02 13:38:03 +0100 |
| commit | 43328a22788c8d856f30a9b0b909e00b7a0c6ecc (patch) | |
| tree | 1ef1604ea6a297c5b83d3821ba19757946d7e67f /crypto/seed.c | |
| parent | 7a615209551c7a9f3a0dea4f6341ebbb2f2dc9c9 (diff) | |
| parent | c2d6598eefba9cbe5ca69ab6ca59e31f797169ac (diff) | |
Merge tag 'v3.18.5' into toradex_vf_3.18-next
This is the 3.18.5 stable release
Conflicts:
arch/arm/mach-imx/clk-imx6q.c
Diffstat (limited to 'crypto/seed.c')
| -rw-r--r-- | crypto/seed.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/crypto/seed.c b/crypto/seed.c index 9c904d6d2151..c6ba8438be43 100644 --- a/crypto/seed.c +++ b/crypto/seed.c @@ -476,3 +476,4 @@ module_exit(seed_fini); MODULE_DESCRIPTION("SEED Cipher Algorithm"); MODULE_LICENSE("GPL"); MODULE_AUTHOR("Hye-Shik Chang <perky@FreeBSD.org>, Kim Hyun <hkim@kisa.or.kr>"); +MODULE_ALIAS_CRYPTO("seed"); |