Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

author David Woodhouse <dwmw2@shinybook.infradead.org>

Sat, 2 Jul 2005 12:39:09 +0000 (13:39 +0100)

committer David Woodhouse <dwmw2@shinybook.infradead.org>

Sat, 2 Jul 2005 12:39:09 +0000 (13:39 +0100)
author David Woodhouse <dwmw2@shinybook.infradead.org>
Sat, 2 Jul 2005 12:39:09 +0000 (13:39 +0100)
committer David Woodhouse <dwmw2@shinybook.infradead.org>
Sat, 2 Jul 2005 12:39:09 +0000 (13:39 +0100)
diff --cc MAINTAINERS
Simple merge
diff --cc fs/namei.c
Simple merge
diff --cc security/selinux/hooks.c
Simple merge
diff --cc security/selinux/ss/services.c
Simple merge
author	David Woodhouse <dwmw2@shinybook.infradead.org>
	Sat, 2 Jul 2005 12:39:09 +0000 (13:39 +0100)
committer	David Woodhouse <dwmw2@shinybook.infradead.org>
	Sat, 2 Jul 2005 12:39:09 +0000 (13:39 +0100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
fs/namei.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