Merge by hand (conflicts between pending drivers and kfree cleanups)
[linux-2.6-microblaze.git] / drivers / cdrom / isp16.h
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2