diff --git a/[refs] b/[refs] index e7ab77296e9f..4c2acec11e51 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1df9f0a73178718969ae47d813b8e7aab2cf073c +refs/heads/master: aa7168f47d912459a99a01c93714f447b44bfa72 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 6bd7d47ab9db..12fc2805ab41 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -2175,6 +2175,11 @@ M: stefanr@s5r6.in-berlin.de L: linux1394-devel@lists.sourceforge.net S: Maintained +INTEGRITY MEASUREMENT ARCHITECTURE (IMA) +P: Mimi Zohar +M: zohar@us.ibm.com +S: Supported + IMS TWINTURBO FRAMEBUFFER DRIVER L: linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers) S: Orphan