diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2012-07-24 13:40:06 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-07-24 13:40:06 +0200 |
| commit | c062c4d1de57789bf15f7641a24c429eeb8a1c6a (patch) | |
| tree | dfd376034ea8458689c937dafa5e318892af82af /MAINTAINERS | |
| parent | 929bd380b7aec9f9553b6509af86cdba25e334b8 (diff) | |
| parent | adefb69b1b94df29ea2df05cd838c0e032b2c473 (diff) | |
| download | linux-c062c4d1de57789bf15f7641a24c429eeb8a1c6a.tar.bz2 | |
Merge branch 'uhid' into for-linus
Conflicts:
drivers/hid/Kconfig
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index c82c343168e8..12dde1f795dd 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6948,6 +6948,13 @@ S: Maintained F: Documentation/filesystems/ufs.txt F: fs/ufs/ +UHID USERSPACE HID IO DRIVER: +M: David Herrmann <dh.herrmann@googlemail.com> +L: linux-input@vger.kernel.org +S: Maintained +F: drivers/hid/uhid.c +F: include/linux/uhid.h + ULTRA-WIDEBAND (UWB) SUBSYSTEM: L: linux-usb@vger.kernel.org S: Orphan |