Merge branch 'devel' into next

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 6198fa3deb9979b9c154677ce47a10ea72d91164..fc6c005c531a3fa51e3cc2095254e217cf292e90 100644 (file)
--- a/MAINTAINERS
+++ b/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