summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2006-08-23 21:11:56 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2006-08-23 21:11:56 -0700
commitb7277155f8fa89cd5696140b4a93cfb53d0091ff (patch)
treec75cb996b2942d15e3a5d4327e9c582336880292 /Documentation
parentccc712fe6b2acbafe9fc31f765a193e3249ca4a1 (diff)
parentc712a9de94a5df5bc0087c14ad0b1aac2c147991 (diff)
downloadlinux-b7277155f8fa89cd5696140b4a93cfb53d0091ff.tar.bz2
Merge branch 'for-linus' of gregkh@master.kernel.org:/pub/scm/linux/kernel/git/dtor/input
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/input/joystick.txt1
1 files changed, 0 insertions, 1 deletions
diff --git a/Documentation/input/joystick.txt b/Documentation/input/joystick.txt
index d53b857a3710..841c353297e6 100644
--- a/Documentation/input/joystick.txt
+++ b/Documentation/input/joystick.txt
@@ -39,7 +39,6 @@ them. Bug reports and success stories are also welcome.
The input project website is at:
- http://www.suse.cz/development/input/
http://atrey.karlin.mff.cuni.cz/~vojtech/input/
There is also a mailing list for the driver at: