Merge branch 'for-next' of git://www.jni.nu/cris into cris_merge
[linux-2.6] / drivers / cdrom /
drwxr-xr-x   ..
-rw-r--r-- 491 Makefile
-rw-r--r-- 96900 cdrom.c
-rw-r--r-- 23290 gdrom.c
-rw-r--r-- 19948 viocd.c