Merge remote-tracking branch 'drm/drm-next' into drm-misc-next
[linux-2.6-block.git] / drivers / cdrom /
drwxr-xr-x   ..
-rw-r--r-- 97 Makefile
-rw-r--r-- 100754 cdrom.c
-rw-r--r-- 22968 gdrom.c