[XFS] Fix merge failures
[pandora-kernel.git] / include / linux / uts.h
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2