Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
[linux-2.6] / drivers / cdrom / optcd.h
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2