diff --git a/[refs] b/[refs] index 1da590dc2a52..076fe89bb8b5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0ca07731e495584bd84dca15a0f065470d594ec4 +refs/heads/master: 7529c301165079d0f149d0e54724829e602f8fc0 diff --git a/trunk/kernel/module.c b/trunk/kernel/module.c index bd088a7c1499..d24deb0dbbc9 100644 --- a/trunk/kernel/module.c +++ b/trunk/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); }