Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6
[linux-2.6] / drivers / cdrom /
drwxr-xr-x   ..
-rw-r--r-- 491 Makefile
-rw-r--r-- 96944 cdrom.c
-rw-r--r-- 23283 gdrom.c
-rw-r--r-- 19977 viocd.c