Merge by hand (conflicts in sr.c)
[linux-2.6-block.git] / fs / smbfs / inode.c
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2