Merge master.kernel.org:/pub/scm/linux/kernel/git/chrisw/lsm-2.6

author Linus Torvalds <torvalds@g5.osdl.org>

Tue, 13 Sep 2005 16:48:54 +0000 (09:48 -0700)

committer Linus Torvalds <torvalds@g5.osdl.org>

Tue, 13 Sep 2005 16:48:54 +0000 (09:48 -0700)
author Linus Torvalds <torvalds@g5.osdl.org>
Tue, 13 Sep 2005 16:48:54 +0000 (09:48 -0700)
committer Linus Torvalds <torvalds@g5.osdl.org>
Tue, 13 Sep 2005 16:48:54 +0000 (09:48 -0700)
diff --cc include/linux/security.h
Simple merge
diff --cc security/seclvl.c
Simple merge
author	Linus Torvalds <torvalds@g5.osdl.org>
	Tue, 13 Sep 2005 16:48:54 +0000 (09:48 -0700)
committer	Linus Torvalds <torvalds@g5.osdl.org>
	Tue, 13 Sep 2005 16:48:54 +0000 (09:48 -0700)
		1	2
include/linux/security.h	patch \|	diff1 \|	diff2 \|	blob \| history
security/seclvl.c	patch \|	diff1 \|	diff2 \|	blob \| history