Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6
[safe/jmp/linux-2.6] / Documentation / pcmcia /
drwxr-xr-x   ..
-rw-r--r-- 1920 devicetable.txt
-rw-r--r-- 2503 driver-changes.txt