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>

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)