Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[linux-2.6] / Documentation / pcmcia /
drwxr-xr-x   ..
-rw-r--r-- 1920 devicetable.txt
-rw-r--r-- 3697 driver-changes.txt