From 54fe8543edfb9ce90052dd7631e1973b2dd20f11 Mon Sep 17 00:00:00 2001 From: Mimi Zohar Date: Wed, 17 Aug 2011 18:52:24 -0400 Subject: [PATCH] --- yaml --- r: 264503 b: refs/heads/master c: c5532b09bf40c398f2acfdd8f100c796d1d3f881 h: refs/heads/master i: 264501: 30ad0dfc1e8034d82071341ab1b4571c5cda2897 264499: 7a9ca8b78ce29e8f6c68ae1253e975d4a4165bbb 264495: 6345d524862b5b88bc9a8020417107adf157b3a6 v: v3 --- [refs] | 2 +- trunk/MAINTAINERS | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) 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