diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-12-09 19:01:27 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-12-09 19:01:27 -0800 |
| commit | 407f3fd8faf80f77c47ebda7501c6a8698d2f3a6 (patch) | |
| tree | 3b41623f7174f1bee5b31853d2b295028cf9e376 /MAINTAINERS | |
| parent | dc47ce90c3a822cd7c9e9339fe4d5f61dcb26b50 (diff) | |
| parent | 1d06825b0ede541f63b5577435abd2fc649a9b5e (diff) | |
| download | talos-obmc-linux-407f3fd8faf80f77c47ebda7501c6a8698d2f3a6.tar.gz talos-obmc-linux-407f3fd8faf80f77c47ebda7501c6a8698d2f3a6.zip | |
Merge 3.2-rc5 into staging-next
This resolves the conflict in the
drivers/staging/iio/industrialio-core.c file due to two different
changes made to resolve the same problem.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index b9db108f01c8..d6c09f3dcaab 100644 --- 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) |
