Merge branches 'release', 'acpi_pm_device_sleep_state' and 'battery' into release
[pandora-kernel.git] / include / asm-m68k / atari_joystick.h
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2