aboutsummaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.osdl.org>2006-12-19 10:32:40 -0800
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-19 10:32:40 -0800
commitf238085415c56618e042252894f2fcc971add645 (patch)
treed69f821381995a7d377283f962583075dc149739 /MAINTAINERS
parenta240d9f1d8e6421cb970632b93e71b2f66c2cd70 (diff)
parent4ef4caad41630c7caa6e2b94c6e7dda7e9689714 (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: [PATCH] Generic HID layer - update MAINTAINERS input/hid: Supporting more keys from the HUT Consumer Page [PATCH] Generic HID layer - build: USB_HID should select HID
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS6
1 files changed, 6 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index dea5b2a6de0..3e926e73387 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1277,6 +1277,12 @@ L: linux-nvidia@lists.surfsouth.com
W: http://drama.obuda.kando.hu/~fero/cgi-bin/hgafb.shtml
S: Maintained
+HID CORE LAYER
+P: Jiri Kosina
+M: jkosina@suse.cz
+L: linux-input@atrey.karlin.mff.cuni.cz
+S: Maintained
+
HIGH-SPEED SCC DRIVER FOR AX.25
P: Klaus Kudielka
M: klaus.kudielka@ieee.org