diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-09 15:10:54 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-09 15:10:54 +1100 |
| commit | 846e6e13b056c74f1ed5838f3c55e722989b637d (patch) | |
| tree | e66b956638267239ba104ee258f12ddb4af637f1 /MAINTAINERS | |
| parent | 3867ac7e86a24791a7afe30d31d53fe2c76723c2 (diff) | |
| parent | 17fa87fe5a5141d3c082c5c91e950aca9e0ec701 (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 f3be0e59b924..215e08a28f67 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5995,6 +5995,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 @@ -13107,7 +13108,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 |