Merge branches 'bkl-removal', 'upstream' and 'upstream-fixes' into for-linus
[linux-2.6.git] / drivers / cdrom /
drwxr-xr-x ..
-rw-r--r-- Makefile
-rw-r--r-- cdrom.c
-rw-r--r-- gdrom.c
-rw-r--r-- viocd.c