Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
[sfrench/cifs-2.6.git] / drivers / cdrom /
drwxr-xr-x   ..
-rw-r--r-- 446 Makefile
-rw-r--r-- 98408 cdrom.c
-rw-r--r-- 22325 viocd.c