Merge branch 'merge' into powerpc-next
[linux-2.6] / drivers / cdrom /
drwxr-xr-x   ..
-rw-r--r-- 491 Makefile
-rw-r--r-- 98239 cdrom.c
-rw-r--r-- 23113 gdrom.c
-rw-r--r-- 19823 viocd.c