diff --git a/[refs] b/[refs] index 3852e3d8e178..65be7a3045a9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6ae301e85c9c58d2f430a8a7057ce488b7ff76df +refs/heads/master: 71038f527f3665f562cf9afe083df729958a099b diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 73548f8ad0b5..3fe4dc2c2564 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -1821,6 +1821,14 @@ M: hch@infradead.org W: ftp://ftp.openlinux.org/pub/people/hch/vxfs S: Maintained +FREEZER +P: Pavel Machek +M: pavel@suse.cz +P: Rafael J. Wysocki +M: rjw@sisk.pl +L: linux-pm@lists.linux-foundation.org +S: Supported + FTRACE P: Steven Rostedt M: rostedt@goodmis.org