Merge 'upstream' branch of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik...
[linux-2.6] / drivers / input / joystick / warrior.c
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2