Merge branch 'max-sect' into upstream

[linux-2.6] / kernel / module.c

diff --git a/kernel/module.c b/kernel/module.c
index bd088a7c1499e8872a0fea69c7f65f17e987518d..d24deb0dbbc9488e91ba855342399c22c3f9d309 100644 (file)
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -1254,6 +1254,7 @@ static inline int license_is_gpl_compatible(const char *license)
                || strcmp(license, "GPL v2") == 0
                || strcmp(license, "GPL and additional rights") == 0
                || strcmp(license, "Dual BSD/GPL") == 0
+               || strcmp(license, "Dual MIT/GPL") == 0
                || strcmp(license, "Dual MPL/GPL") == 0);
 }