Merge branch 'master' into csb1725

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

diff --git a/fs/smbfs/proto.h b/drivers/staging/smbfs/proto.h
similarity index 100%
rename from fs/smbfs/proto.h
rename to drivers/staging/smbfs/proto.h