Merge branch 'master' into tk71

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

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