diff --git a/[refs] b/[refs] index 95c54cb5c040..579ac19e7cd8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7560fa60fcdcdb0da662f6a9fad9064b554ef46c +refs/heads/master: fb3a0fb6fd3e997b61f1b121e980aeea88fa4529 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index a0f78e764329..d34775e4038e 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -1138,6 +1138,12 @@ L: accessrunner-general@lists.sourceforge.net W: http://accessrunner.sourceforge.net/ S: Maintained +CONTROL GROUPS (CGROUPS) +P: Paul Menage +M: menage@google.com +L: containers@lists.linux-foundation.org +S: Maintained + CORETEMP HARDWARE MONITORING DRIVER P: Rudolf Marek M: r.marek@assembler.cz