diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-22 03:12:37 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-22 03:12:37 -0400 |
| commit | 8725f25acc656c1522d48a6746055099efdaca4c (patch) | |
| tree | e241424fa58178ed6c2a95a4eb931ea83dbea33c /Documentation/input/joystick.txt | |
| parent | c69cccc95fe4b90dde5fe33e6a3b77880b534fa4 (diff) | |
| parent | 93ded9b8fd42abe2c3607097963d8de6ad9117eb (diff) | |
Merge commit 'origin/master'
Manually fixed up:
drivers/net/fs_enet/fs_enet-main.c
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 |