Merge 'staging-next' to Linus's tree

[net-next-2.6.git] / drivers / staging / smbfs / Kconfig

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