Manual merge with Linus.
[linux-2.6-microblaze.git] / security / selinux / ss / conditional.h
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2