diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-17 13:55:35 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-17 13:55:35 +1100 |
commit | cb551a11f22b8551da71752237078e5a3d4ba9d6 (patch) | |
tree | add425c43bd59a698724cbded24d0df884754a03 /MAINTAINERS | |
parent | 54d31691a051a57828074d1447012eabe6d14e5a (diff) | |
parent | 6cf18e6927c0b224f972e3042fb85770d63cb9f8 (diff) |
Merge remote-tracking branch 'char-misc/char-misc-next'
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index d23c4def0920..516593b27891 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6028,6 +6028,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 @@ -13150,7 +13151,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 |