Merge branch 'linus' into x86/header-guards
[linux-2.6] / fs / smbfs / ioctl.c
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2