diff --git a/[refs] b/[refs] index 582ef807ea4e..2ec64115058f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 22a37bcb7857541eb2d37806c4744ee2530baa98 +refs/heads/master: de3b69d7d87e1e86c0307f0f15b377dcebeab906 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 6198fa3deb99..fc6c005c531a 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -1777,6 +1777,11 @@ M: hch@infradead.org W: ftp://ftp.openlinux.org/pub/people/hch/vxfs S: Maintained +FTRACE +P: Steven Rostedt +M: srostedt@redhat.com +S: Maintained + FUJITSU FR-V (FRV) PORT P: David Howells M: dhowells@redhat.com