diff options
| author | Anton Vorontsov <cbouatmailru@gmail.com> | 2008-07-29 18:05:23 -0400 |
|---|---|---|
| committer | Anton Vorontsov <cbouatmailru@gmail.com> | 2008-07-29 18:05:23 -0400 |
| commit | 9fec6060d9e48ed7db0dac0e16d0f0f0e615b7f6 (patch) | |
| tree | 74b41f31a08f6500ff3dfcf64ba21e2d9a8e87e5 /Documentation/input/joystick.txt | |
| parent | fece418418f51e92dd7e67e17c5e3fe5a28d3279 (diff) | |
| parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
Merge branch 'master' of /home/cbou/linux-2.6
Conflicts:
drivers/power/Kconfig
drivers/power/Makefile
Diffstat (limited to 'Documentation/input/joystick.txt')
| -rw-r--r-- | Documentation/input/joystick.txt | 1 |
1 files changed, 0 insertions, 1 deletions
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 @@ | |||
| 1 | Linux Joystick driver v2.0.0 | 1 | Linux Joystick driver v2.0.0 |
| 2 | (c) 1996-2000 Vojtech Pavlik <vojtech@ucw.cz> | 2 | (c) 1996-2000 Vojtech Pavlik <vojtech@ucw.cz> |
| 3 | Sponsored by SuSE | 3 | Sponsored by SuSE |
| 4 | $Id: joystick.txt,v 1.12 2002/03/03 12:13:07 jdeneux Exp $ | ||
| 5 | ---------------------------------------------------------------------------- | 4 | ---------------------------------------------------------------------------- |
| 6 | 5 | ||
| 7 | 0. Disclaimer | 6 | 0. Disclaimer |