Merge branch 'master' into csb1725

[mv-sheeva.git] / drivers / staging / smbfs / smb_mount.h

diff --git a/include/linux/smb_mount.h b/drivers/staging/smbfs/smb_mount.h
similarity index 100%
rename from include/linux/smb_mount.h
rename to drivers/staging/smbfs/smb_mount.h