diff --git a/[refs] b/[refs] index 3c5219e669f5..289d23f79f53 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dbe5ad17ec62fbd3be7789f9a5ab71d23da8acf0 +refs/heads/master: c5532b09bf40c398f2acfdd8f100c796d1d3f881 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 51d42fbc8dc4..02a60b8e503b 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -2555,6 +2555,11 @@ S: Maintained F: Documentation/filesystems/ext4.txt F: fs/ext4/ +Extended Verification Module (EVM) +M: Mimi Zohar +S: Supported +F: security/integrity/evm/ + F71805F HARDWARE MONITORING DRIVER M: Jean Delvare L: lm-sensors@lm-sensors.org