Merge branch 'v4.9-shared/sip-hdr' into v4.9-clk/next

[linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 5e1f03f0a526d5b40ebf8a491d56978fed3815ba..20bb1d00098c70dacad7a9c778087f9319b0c5c6 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3219,7 +3219,7 @@ M:        Johannes Weiner <[email protected]>
 L:     [email protected]
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
 S:     Maintained
-F:     Documentation/cgroups/
+F:     Documentation/cgroup*
 F:     include/linux/cgroup*
 F:     kernel/cgroup*
 
@@ -3230,7 +3230,7 @@ W:        http://www.bullopensource.org/cpuset/
 W:     http://oss.sgi.com/projects/cpusets/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
 S:     Maintained
-F:     Documentation/cgroups/cpusets.txt
+F:     Documentation/cgroup-v1/cpusets.txt
 F:     include/linux/cpuset.h
 F:     kernel/cpuset.c
 
@@ -3494,6 +3494,7 @@ F:        Documentation/ABI/testing/sysfs-class-cxl
 CXLFLASH (IBM Coherent Accelerator Processor Interface CAPI Flash) SCSI DRIVER
 M:     Manoj N. Kumar <[email protected]>
 M:     Matthew R. Ochs <[email protected]>
+M:     Uma Krishnan <[email protected]>
 L:     [email protected]
 S:     Supported
 F:     drivers/scsi/cxlflash/
@@ -8340,6 +8341,7 @@ F:        drivers/ntb/
 F:     drivers/net/ntb_netdev.c
 F:     include/linux/ntb.h
 F:     include/linux/ntb_transport.h
+F:     tools/testing/selftests/ntb/
 
 NTB INTEL DRIVER
 M:     Jon Mason <[email protected]>
@@ -9250,6 +9252,16 @@ W:       http://www.st.com/spear
 S:     Maintained
 F:     drivers/pinctrl/spear/
 
+PISTACHIO SOC SUPPORT
+M:      James Hartley <[email protected]>
+M:      Ionela Voinescu <[email protected]>
+L:      [email protected]
+S:      Maintained
+F:      arch/mips/pistachio/
+F:      arch/mips/include/asm/mach-pistachio/
+F:      arch/mips/boot/dts/pistachio/
+F:      arch/mips/configs/pistachio*_defconfig
+
 PKTCDVD DRIVER
 M:     Jiri Kosina <[email protected]>
 S:     Maintained
@@ -9828,10 +9840,14 @@ L:      [email protected]
 Q:     http://patchwork.ozlabs.org/project/rtc-linux/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git
 S:     Maintained
+F:     Documentation/devicetree/bindings/rtc/
 F:     Documentation/rtc.txt
 F:     drivers/rtc/
 F:     include/linux/rtc.h
 F:     include/uapi/linux/rtc.h
+F:     include/linux/rtc/
+F:     include/linux/platform_data/rtc-*
+F:     tools/testing/selftests/timers/rtctest.c
 
 REALTEK AUDIO CODECS
 M:     Bard Liao <[email protected]>
@@ -12403,6 +12419,19 @@ S:     Maintained
 F:     drivers/media/v4l2-core/videobuf2-*
 F:     include/media/videobuf2-*
 
+VIRTIO AND VHOST VSOCK DRIVER
+M:     Stefan Hajnoczi <[email protected]>
+L:     [email protected]
+L:     [email protected]
+L:     [email protected]
+S:     Maintained
+F:     include/linux/virtio_vsock.h
+F:     include/uapi/linux/virtio_vsock.h
+F:     net/vmw_vsock/virtio_transport_common.c
+F:     net/vmw_vsock/virtio_transport.c
+F:     drivers/vhost/vsock.c
+F:     drivers/vhost/vsock.h
+
 VIRTUAL SERIO DEVICE DRIVER
 M:     Stephen Chandler Paul <[email protected]>
 S:     Maintained