Merge branch 'master' into for-2.6.31
[linux-2.6] / drivers / cdrom /
drwxr-xr-x   ..
-rw-r--r-- 491 Makefile
-rw-r--r-- 99231 cdrom.c
-rw-r--r-- 23158 gdrom.c
-rw-r--r-- 19611 viocd.c