Merge ../linux-2.6
[linux-2.6] / include / asm-m68k / atari_joystick.h
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2