Merge master.kernel.org:/pub/scm/linux/kernel/git/chrisw/lsm-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 13 Sep 2005 16:48:54 +0000 (09:48 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 13 Sep 2005 16:48:54 +0000 (09:48 -0700)
commitddbf9ef385bfbef897210733abfb73cb9b94ecec
tree64a9e965a71eef13e813a3327f8d74aa7168ee19
parent5d54e69c68c05b162a56f9914cae72afd7e6f40a
parent2c40579bdc2a94977fcff2521d5b53a97c33e77a
Merge /pub/scm/linux/kernel/git/chrisw/lsm-2.6
include/linux/security.h
security/seclvl.c