Merge branch 'x86-security-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[linux-2.6.git] / Documentation / apparmor.txt
2010-08-02 John Johansen AppArmor: update Maintainer and Documentation