Merge branch 'thinkpad' into test
[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-- 39909 mspro_block.c