projects
/
GitHub
/
MotorolaMobilityLLC
/
kernel-slsi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[GitHub/MotorolaMobilityLLC/kernel-slsi.git]
/
MAINTAINERS
diff --git
a/MAINTAINERS
b/MAINTAINERS
index 0223d6d191df643405489b7b7122473d44238b10..151f4ef978a4aa5ae82c976e76c8716cafa9f4fb 100644
(file)
--- a/
MAINTAINERS
+++ b/
MAINTAINERS
@@
-1856,7
+1856,7
@@
W: http://www.openib.org/
T: git kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git
S: Supported
-INPUT (KEYBOARD, MOUSE, JOYSTICK) DRIVERS
+INPUT (KEYBOARD, MOUSE, JOYSTICK
, TOUCHSCREEN
) DRIVERS
P: Dmitry Torokhov
M: dmitry.torokhov@gmail.com
M: dtor@mail.ru