Merge branch 'x86/header-guards' into x86-v28-for-linus-phase1
[linux-2.6] / drivers / cdrom /
drwxr-xr-x   ..
-rw-r--r-- 491 Makefile
-rw-r--r-- 96926 cdrom.c
-rw-r--r-- 23260 gdrom.c
-rw-r--r-- 19977 viocd.c