diff --git a/[refs] b/[refs] index 05204415abd0..748eb7283952 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9b6d12198448aa51979b81aa68651cb49c0c5a02 +refs/heads/master: 70bd4399bbdd4dd35697664af00fcd48cb2008a2 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 3523ab000f1f..d34351b1265b 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -4161,6 +4161,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 +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 L: linux-m32r@ml.linux-m32r.org (moderated for non-subscribers)