Merge branches 'for-3.18/upstream-fixes' and 'for-3.19/upstream' into for-linus
[cascardo/linux.git] / drivers / cdrom /
drwxr-xr-x   ..
-rw-r--r-- 446 Makefile
-rw-r--r-- 100184 cdrom.c
-rw-r--r-- 23374 gdrom.c