Merge master.kernel.org:/pub/scm/linux/kernel/git/chrisw/lsm-2.6
Linus Torvalds [Tue, 13 Sep 2005 16:48:54 +0000 (09:48 -0700)]
1  2 
include/linux/security.h
security/seclvl.c

Simple merge
Simple merge