Merge master.kernel.org:/pub/scm/linux/kernel/git/dwmw2/audit-2.6

author Linus Torvalds <[email protected]>

Tue, 13 Sep 2005 16:47:30 +0000 (09:47 -0700)

committer Linus Torvalds <[email protected]>

Tue, 13 Sep 2005 16:47:30 +0000 (09:47 -0700)
author Linus Torvalds <[email protected]>
Tue, 13 Sep 2005 16:47:30 +0000 (09:47 -0700)
committer Linus Torvalds <[email protected]>
Tue, 13 Sep 2005 16:47:30 +0000 (09:47 -0700)
diff --cc MAINTAINERS
Simple merge
diff --cc arch/ppc64/kernel/asm-offsets.c
Simple merge
diff --cc arch/ppc64/kernel/entry.S
Simple merge
diff --cc fs/namei.c
Simple merge
diff --cc kernel/audit.c
Simple merge
diff --cc security/selinux/avc.c
Simple merge
diff --cc security/selinux/hooks.c
Simple merge
diff --cc security/selinux/ss/services.c
Simple merge
author	Linus Torvalds <[email protected]>
	Tue, 13 Sep 2005 16:47:30 +0000 (09:47 -0700)
committer	Linus Torvalds <[email protected]>
	Tue, 13 Sep 2005 16:47:30 +0000 (09:47 -0700)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/ppc64/kernel/asm-offsets.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/ppc64/kernel/entry.S	patch \|	diff1 \|	diff2 \|	blob \| history
fs/namei.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/audit.c	patch \|	diff1 \|	diff2 \|	blob \| history
security/selinux/avc.c	patch \|	diff1 \|	diff2 \|	blob \| history
security/selinux/hooks.c	patch \|	diff1 \|	diff2 \|	blob \| history
security/selinux/ss/services.c	patch \|	diff1 \|	diff2 \|	blob \| history