Merge commit 'v2.6.29-rc1' into timers/hrtimers
[linux-2.6] / drivers / memstick / core /
drwxr-xr-x   ..
-rw-r--r-- 947 Kconfig
-rw-r--r-- 198 Makefile
-rw-r--r-- 16080 memstick.c
-rw-r--r-- 39663 mspro_block.c