Merge branch 'linus' into sched/core, to resolve conflicts
[cascardo/linux.git] / drivers / memstick /
drwxr-xr-x   ..
-rw-r--r-- 609 Kconfig
-rw-r--r-- 178 Makefile
drwxr-xr-x - core
drwxr-xr-x - host