Merge branch 'master' into tk71

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

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