]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
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)
1  2 
include/linux/security.h
security/seclvl.c

Simple merge
Simple merge