Merge branches 'cma', 'cxgb3', 'ehca', 'ipoib', 'mad', 'mlx4' and 'nes' into for...
[linux-2.6] / drivers / memstick / core /
drwxr-xr-x   ..
-rw-r--r-- 947 Kconfig
-rw-r--r-- 198 Makefile
-rw-r--r-- 16123 memstick.c
-rw-r--r-- 39932 mspro_block.c