Merge branch 'linus' into tracing/core

[firefly-linux-kernel-4.4.55.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 64b9e447545c2df6d9056cc5fd66fc360b623df3..9addc2838e4f2e17112c67f5ef010a744790e6cc 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2152,13 +2152,16 @@ F:      Documentation/filesystems/caching/
 F:     fs/fscache/
 F:     include/linux/fscache*.h
 
-FTRACE
+TRACING
 M:     Steven Rostedt <rostedt@goodmis.org>
+M:     Frederic Weisbecker <fweisbec@gmail.com>
+M:     Ingo Molnar <mingo@redhat.com>
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git tracing/core
 S:     Maintained
 F:     Documentation/trace/ftrace.txt
 F:     arch/*/*/*/ftrace.h
 F:     arch/*/kernel/ftrace.c
-F:     include/*/ftrace.h
+F:     include/*/ftrace.h include/trace/ include/linux/trace*.h
 F:     kernel/trace/
 
 FUJITSU FR-V (FRV) PORT
@@ -2218,6 +2221,13 @@ T:       git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git
 S:     Maintained
 F:     include/asm-generic
 
+GENERIC UIO DRIVER FOR PCI DEVICES
+M:     Michael S. Tsirkin <mst@redhat.com>
+L:     kvm@vger.kernel.org
+L:     linux-kernel@vger.kernel.org
+S:     Supported
+F:     drivers/uio/uio_pci_generic.c
+
 GFS2 FILE SYSTEM
 M:     Steven Whitehouse <swhiteho@redhat.com>
 L:     cluster-devel@redhat.com