diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-21 10:27:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-21 10:27:31 -0700 |
| commit | 519f0141f1c42e2b8b59c7dea005cbf6095358e8 (patch) | |
| tree | 980e39f30a8b8677916a9bddee675ed0d0123d81 /Documentation | |
| parent | f8b71a3a92d69cb1c9c2162f9235d3dd550e4aa0 (diff) | |
| parent | 908cf4b925e419bc74f3297b2f0e51d6f8a81da2 (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: (48 commits)
Input: add switch for dock events
Input: add microphone insert switch definition
Input: i8042 - add Arima-Rioworks HDAMB board to noloop list
Input: sgi_btns - add support for SGI Indy volume buttons
Input: add option to disable HP SDC driver
Input: serio - trivial documentation fix
Input: add new serio driver for Xilinx XPS PS2 IP
Input: add driver for Tabletkiosk Sahara TouchIT-213 touchscreen
Input: new driver for SGI O2 volume buttons
Input: yealink - reliably kill urbs
Input: q40kbd - make q40kbd_lock static
Input: gtco - eliminate early return
Input: i8042 - add Dritek quirk for Acer Aspire 5720
Input: usbtouchscreen - ignore eGalax screens supporting HID protocol
Input: i8042 - add Medion NAM 2070 to noloop blacklist
Input: i8042 - add Gericom Bellagio to nomux blacklist
Input: i8042 - add Acer Aspire 1360 to nomux blacklist
Input: hp_sdc_mlc.c - make a struct static
Input: hil_mlc.c - make code static
Input: wistron - generate normal key event if bluetooth or wifi not present
...
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/input/gameport-programming.txt | 2 | ||||
| -rw-r--r-- | Documentation/input/input.txt | 1 | ||||
| -rw-r--r-- | Documentation/input/joystick-api.txt | 2 | ||||
| -rw-r--r-- | Documentation/input/joystick-parport.txt | 1 | ||||
| -rw-r--r-- | Documentation/input/joystick.txt | 1 |
5 files changed, 0 insertions, 7 deletions
diff --git a/Documentation/input/gameport-programming.txt b/Documentation/input/gameport-programming.txt index 14e0a8b70225..03a74fc3b496 100644 --- a/Documentation/input/gameport-programming.txt +++ b/Documentation/input/gameport-programming.txt @@ -1,5 +1,3 @@ -$Id: gameport-programming.txt,v 1.3 2001/04/24 13:51:37 vojtech Exp $ - Programming gameport drivers ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/Documentation/input/input.txt b/Documentation/input/input.txt index ff8cea0225f9..686ee9932dff 100644 --- a/Documentation/input/input.txt +++ b/Documentation/input/input.txt @@ -1,7 +1,6 @@ Linux Input drivers v1.0 (c) 1999-2001 Vojtech Pavlik <vojtech@ucw.cz> Sponsored by SuSE - $Id: input.txt,v 1.8 2002/05/29 03:15:01 bradleym Exp $ ---------------------------------------------------------------------------- 0. Disclaimer diff --git a/Documentation/input/joystick-api.txt b/Documentation/input/joystick-api.txt index acbd32b88454..c507330740cd 100644 --- a/Documentation/input/joystick-api.txt +++ b/Documentation/input/joystick-api.txt @@ -5,8 +5,6 @@ 7 Aug 1998 - $Id: joystick-api.txt,v 1.2 2001/05/08 21:21:23 vojtech Exp $ - 1. Initialization ~~~~~~~~~~~~~~~~~ diff --git a/Documentation/input/joystick-parport.txt b/Documentation/input/joystick-parport.txt index ede5f33daad3..1c856f32ff2c 100644 --- a/Documentation/input/joystick-parport.txt +++ b/Documentation/input/joystick-parport.txt @@ -2,7 +2,6 @@ (c) 1998-2000 Vojtech Pavlik <vojtech@ucw.cz> (c) 1998 Andree Borrmann <a.borrmann@tu-bs.de> Sponsored by SuSE - $Id: joystick-parport.txt,v 1.6 2001/09/25 09:31:32 vojtech Exp $ ---------------------------------------------------------------------------- 0. Disclaimer diff --git a/Documentation/input/joystick.txt b/Documentation/input/joystick.txt index 389de9bd9878..154d767b2acb 100644 --- a/Documentation/input/joystick.txt +++ b/Documentation/input/joystick.txt @@ -1,7 +1,6 @@ Linux Joystick driver v2.0.0 (c) 1996-2000 Vojtech Pavlik <vojtech@ucw.cz> Sponsored by SuSE - $Id: joystick.txt,v 1.12 2002/03/03 12:13:07 jdeneux Exp $ ---------------------------------------------------------------------------- 0. Disclaimer |