Merge branch 'master' into tk71

[mv-sheeva.git] / drivers / staging / smbfs / smbfs.txt

diff --git a/Documentation/filesystems/smbfs.txt b/drivers/staging/smbfs/smbfs.txt
similarity index 100%
rename from Documentation/filesystems/smbfs.txt
rename to drivers/staging/smbfs/smbfs.txt