diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-17 13:37:01 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-17 13:37:01 -0400 |
| commit | d9cbf022bb75497fa2ecd7ae166fc92b000ad46e (patch) | |
| tree | b7a5c446893448f87ddb8a330b4499ca4c0a0538 /MAINTAINERS | |
| parent | 0835619348b097404f4f85bc5195c6e23a2f8de4 (diff) | |
| parent | c3a4924565e2eecf2539871abd123d35be6d76d5 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
Revert "HID: magicmouse: ignore 'ivalid report id' while switching modes"
HID: hid-multitouch: fix broken eGalax
HID: MAINTAINERS: Update USB HID/HIDBP DRIVERS pattern
HID: hid-multitouch: add support for Chunghwa multi-touch panel
HID: hiddev: fix use after free in hiddev_release
HID: add quirk for HyperPen 10000U
HID: hiddev: fix potential use-after-free
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 6c59eb90fdf4..502f2dd761eb 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -6463,7 +6463,7 @@ M: Jiri Kosina <jkosina@suse.cz> | |||
| 6463 | L: linux-usb@vger.kernel.org | 6463 | L: linux-usb@vger.kernel.org |
| 6464 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git | 6464 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git |
| 6465 | S: Maintained | 6465 | S: Maintained |
| 6466 | F: Documentation/usb/hiddev.txt | 6466 | F: Documentation/hid/hiddev.txt |
| 6467 | F: drivers/hid/usbhid/ | 6467 | F: drivers/hid/usbhid/ |
| 6468 | 6468 | ||
| 6469 | USB ISP116X DRIVER | 6469 | USB ISP116X DRIVER |