diff options
| author | James Morris <jmorris@namei.org> | 2009-05-22 04:40:59 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-05-22 04:40:59 -0400 |
| commit | 2c9e703c618106f5383226fbb1f526cb11034f8a (patch) | |
| tree | 87d7548001ea82f655fede0640466fc16aabcdf7 /drivers/crypto/padlock-aes.c | |
| parent | 6470c077cae12227318f40f3e6d756caadcce4b0 (diff) | |
| parent | 5805977e63a36ad56594a623f3bd2bebcb7db233 (diff) | |
Merge branch 'master' into next
Conflicts:
fs/exec.c
Removed IMA changes (the IMA checks are now performed via may_open()).
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'drivers/crypto/padlock-aes.c')
| -rw-r--r-- | drivers/crypto/padlock-aes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/crypto/padlock-aes.c b/drivers/crypto/padlock-aes.c index 3f0fdd18255d..856b3cc25583 100644 --- a/drivers/crypto/padlock-aes.c +++ b/drivers/crypto/padlock-aes.c | |||
| @@ -489,4 +489,4 @@ MODULE_DESCRIPTION("VIA PadLock AES algorithm support"); | |||
| 489 | MODULE_LICENSE("GPL"); | 489 | MODULE_LICENSE("GPL"); |
| 490 | MODULE_AUTHOR("Michal Ludvig"); | 490 | MODULE_AUTHOR("Michal Ludvig"); |
| 491 | 491 | ||
| 492 | MODULE_ALIAS("aes-all"); | 492 | MODULE_ALIAS("aes"); |