diff options
| author | Anders Roxell <anders.roxell@linaro.org> | 2015-03-20 21:03:53 +0100 |
|---|---|---|
| committer | Anders Roxell <anders.roxell@linaro.org> | 2015-03-20 21:03:53 +0100 |
| commit | e20e8b472345ea5babd805db6726d1a7000f7673 (patch) | |
| tree | 1aaff25991578806a867ba3efcb0f7fd59940388 /arch/x86/crypto/cast6_avx_glue.c | |
| parent | 588956edf5bb33741de41687677f21f5c37671da (diff) | |
| parent | c59ecb2edfc11b725a0fa4cb5420c4dbae482c17 (diff) | |
Merge tag 'v3.14.36-rt31-lno1' into linux-linaro-lsk-v3.14-rt
Linux 3.14.36-rt31
Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
Conflicts:
arch/arm64/kernel/setup.c
arch/x86/kernel/traps.c
Diffstat (limited to 'arch/x86/crypto/cast6_avx_glue.c')
| -rw-r--r-- | arch/x86/crypto/cast6_avx_glue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/crypto/cast6_avx_glue.c b/arch/x86/crypto/cast6_avx_glue.c index 09f3677393e4..0160f68a57ff 100644 --- a/arch/x86/crypto/cast6_avx_glue.c +++ b/arch/x86/crypto/cast6_avx_glue.c @@ -611,4 +611,4 @@ module_exit(cast6_exit); MODULE_DESCRIPTION("Cast6 Cipher Algorithm, AVX optimized"); MODULE_LICENSE("GPL"); -MODULE_ALIAS("cast6"); +MODULE_ALIAS_CRYPTO("cast6"); |