diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-02 19:37:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-02 19:37:41 -0700 |
| commit | a89b7717a8c9be41a4856134b60a4d7a66df13f6 (patch) | |
| tree | 89578ae1ecf1fb7ac2501d0b3173783b8101d648 /MAINTAINERS | |
| parent | 29dd5a7733fcb72696e90247ffbab57b0a591f67 (diff) | |
| parent | eb76c5c03caaa2b5c362b8514fb727047baa8fd9 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: linux-input mailing list moved to vger.kernel.org
Input: inport, logibm - use KERN_INFO when reporting missing mouse
Input: appletouch - idle reset logic broke older Fountains
Input: hp_sdc.c - fix section mismatch
Input: appletouch - add Johannes Berg as maintainer
Input: Add Euro and Dollar key codes
Input: xpad - add more USB IDs
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 4a26f832b4b..6c0e44bbf60 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -398,6 +398,12 @@ P: Arnaldo Carvalho de Melo M: acme@ghostprotocols.net S: Maintained +APPLETOUCH TOUCHPAD DRIVER +P: Johannes Berg +M: johannes@sipsolutions.net +L: linux-input@vger.kernel.org +S: Maintained + ARC FRAMEBUFFER DRIVER P: Jaya Kumar M: jayalk@intworks.biz @@ -1701,7 +1707,7 @@ S: Maintained HID CORE LAYER P: Jiri Kosina M: jkosina@suse.cz -L: linux-input@atrey.karlin.mff.cuni.cz +L: linux-input@vger.kernel.org T: git kernel.org:/pub/scm/linux/kernel/git/jikos/hid.git S: Maintained @@ -1927,8 +1933,7 @@ INPUT (KEYBOARD, MOUSE, JOYSTICK, TOUCHSCREEN) DRIVERS P: Dmitry Torokhov M: dmitry.torokhov@gmail.com M: dtor@mail.ru -L: linux-input@atrey.karlin.mff.cuni.cz -L: linux-joystick@atrey.karlin.mff.cuni.cz +L: linux-input@vger.kernel.org T: git kernel.org:/pub/scm/linux/kernel/git/dtor/input.git S: Maintained |