diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-19 13:32:40 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-19 13:32:40 -0500 |
| commit | f238085415c56618e042252894f2fcc971add645 (patch) | |
| tree | d69f821381995a7d377283f962583075dc149739 /MAINTAINERS | |
| parent | a240d9f1d8e6421cb970632b93e71b2f66c2cd70 (diff) | |
| parent | 4ef4caad41630c7caa6e2b94c6e7dda7e9689714 (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-- | MAINTAINERS | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index dea5b2a6de0a..3e926e733878 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -1277,6 +1277,12 @@ L: linux-nvidia@lists.surfsouth.com | |||
| 1277 | W: http://drama.obuda.kando.hu/~fero/cgi-bin/hgafb.shtml | 1277 | W: http://drama.obuda.kando.hu/~fero/cgi-bin/hgafb.shtml |
| 1278 | S: Maintained | 1278 | S: Maintained |
| 1279 | 1279 | ||
| 1280 | HID CORE LAYER | ||
| 1281 | P: Jiri Kosina | ||
| 1282 | M: jkosina@suse.cz | ||
| 1283 | L: linux-input@atrey.karlin.mff.cuni.cz | ||
| 1284 | S: Maintained | ||
| 1285 | |||
| 1280 | HIGH-SPEED SCC DRIVER FOR AX.25 | 1286 | HIGH-SPEED SCC DRIVER FOR AX.25 |
| 1281 | P: Klaus Kudielka | 1287 | P: Klaus Kudielka |
| 1282 | M: klaus.kudielka@ieee.org | 1288 | M: klaus.kudielka@ieee.org |