]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
Merge master.kernel.org:/pub/scm/linux/kernel/git/dwmw2/audit-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 13 Sep 2005 16:47:30 +0000 (09:47 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 13 Sep 2005 16:47:30 +0000 (09:47 -0700)
1  2 
MAINTAINERS
arch/ppc64/kernel/asm-offsets.c
arch/ppc64/kernel/entry.S
fs/namei.c
kernel/audit.c
security/selinux/avc.c
security/selinux/hooks.c
security/selinux/ss/services.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
diff --cc fs/namei.c
Simple merge
diff --cc kernel/audit.c
Simple merge
Simple merge
Simple merge
Simple merge