summaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2014-07-21 14:03:39 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2014-07-21 14:03:39 +1000
commit78e84fffb1d9293ff29b641509272e3e1ad6a837 (patch)
tree4ba57b1c00760d967b8c9a47bf3e7ba8bfc841f6 /MAINTAINERS
parent72b9ceee1746dc9ce1f8d6b228694a0efd3c80fd (diff)
parent09c8fb63fb976f77af54f10a5ec2e3bb30dfc86f (diff)
Merge remote-tracking branch 'input/next'
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS7
1 files changed, 7 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 47d3a9c8d277..f7345d5cc506 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9854,6 +9854,13 @@ M: Pierre Ossman <pierre@ossman.eu>
S: Maintained
F: drivers/mmc/host/wbsd.*
+WACOM PROTOCOL 4 SERIAL TABLETS
+M: Julian Squires <julian@cipht.net>
+M: Hans de Goede <hdegoede@redhat.com>
+L: linux-input@vger.kernel.org
+S: Maintained
+F: drivers/input/tablet/wacom_serial4.c
+
WATCHDOG DEVICE DRIVERS
M: Wim Van Sebroeck <wim@iguana.be>
L: linux-watchdog@vger.kernel.org