Merge branch 'tracing/ftrace' into auto-ftrace-next
[linux-2.6] / drivers / memstick / core /
drwxr-xr-x   ..
-rw-r--r-- 947 Kconfig
-rw-r--r-- 198 Makefile
-rw-r--r-- 15803 memstick.c
-rw-r--r-- 39670 mspro_block.c