Merge 3.2-rc5 into staging-next

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index b9db108f01c8ae2d27575ae73bb0206e361c028c..d6c09f3dcaabd97f13336b936556b9e63268a7c4 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4152,6 +4152,13 @@ W:       http://ltp.sourceforge.net/
 T:     git git://ltp.git.sourceforge.net/gitroot/ltp/ltp-dev
 S:     Maintained
 
+LTTng (Linux Trace Toolkit Next Generation)
+M:     Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+L:     lttng-dev@lists.lttng.org (moderated for non-subscribers)
+W:     http://lttng.org
+S:     Maintained
+F:     drivers/staging/lttng/
+
 M32R ARCHITECTURE
 M:     Hirokazu Takata <takata@linux-m32r.org>
 L:     linux-m32r@ml.linux-m32r.org (moderated for non-subscribers)