Merge commit 'v2.6.36-rc1' into kbuild/rc-fixes
[linux-2.6.git] / Documentation / apparmor.txt
2010-08-02 John Johansen AppArmor: update Maintainer and Documentation