Merge by hand (conflicts in sr.c)
[platform/kernel/linux-starfive.git] / fs / befs / attribute.c
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2