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