Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[~andy/linux] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 9d8ab7c681f9e3dd8e5c270cac5f713eb0395c89..caa7c3a1fef97d7d2e42b82b7dfdd8cdd3a55ecb 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6961,6 +6961,14 @@ M:       Maxim Levitsky <maximlevitsky@gmail.com>
 S:     Maintained
 F:     drivers/memstick/host/r592.*
 
+ROCCAT DRIVERS
+M:     Stefan Achatz <erazor_de@users.sourceforge.net>
+W:     http://sourceforge.net/projects/roccat/
+S:     Maintained
+F:     drivers/hid/hid-roccat*
+F:     include/linux/hid-roccat*
+F:     Documentation/ABI/*/sysfs-driver-hid-roccat*
+
 ROCKETPORT DRIVER
 P:     Comtrol Corp.
 W:     http://www.comtrol.com