Merge commit 'v2.6.30-rc5' into x86/mm
[linux-2.6] / Documentation / input / joystick.txt
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2