Merge tag 'char-misc-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk...

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index d6e91e96f4e513cd5bd73e538c5e0ee53896eba4..427c97e429bf628f7c09806c125e45e1f18ae2fe 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5993,6 +5993,7 @@ S:        Maintained
 F:     arch/x86/include/asm/mshyperv.h
 F:     arch/x86/include/uapi/asm/hyperv.h
 F:     arch/x86/kernel/cpu/mshyperv.c
+F:     arch/x86/hyperv
 F:     drivers/hid/hid-hyperv.c
 F:     drivers/hv/
 F:     drivers/input/serio/hyperv-keyboard.c
@@ -13071,7 +13072,7 @@ USERSPACE I/O (UIO)
 M:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
-F:     Documentation/DocBook/uio-howto.tmpl
+F:     Documentation/driver-api/uio-howto.rst
 F:     drivers/uio/
 F:     include/linux/uio*.h