Manual merge of for-linus to upstream (fix conflicts in drivers/infiniband/core/ucm.c)
[linux-2.6] / drivers / char / pcmcia /
drwxr-xr-x   ..
-rw-r--r-- 608 Kconfig
-rw-r--r-- 134 Makefile
-rw-r--r-- 121278 synclink_cs.c