Merge branch 'master' of git://git.infradead.org/users/pcmoore/lblnet-2.6_next into...

author James Morris <jmorris@namei.org>

Fri, 10 Oct 2008 22:26:14 +0000 (09:26 +1100)

committer James Morris <jmorris@namei.org>

Fri, 10 Oct 2008 22:26:14 +0000 (09:26 +1100)
author James Morris <jmorris@namei.org>
Fri, 10 Oct 2008 22:26:14 +0000 (09:26 +1100)
committer James Morris <jmorris@namei.org>
Fri, 10 Oct 2008 22:26:14 +0000 (09:26 +1100)
diff --cc security/selinux/hooks.c
Simple merge
diff --cc security/selinux/ss/services.c
Simple merge
diff --cc security/smack/smackfs.c
Simple merge
author	James Morris <jmorris@namei.org>
	Fri, 10 Oct 2008 22:26:14 +0000 (09:26 +1100)
committer	James Morris <jmorris@namei.org>
	Fri, 10 Oct 2008 22:26:14 +0000 (09:26 +1100)
		1	2
security/selinux/hooks.c	patch \|	diff1 \|	diff2 \|	blob \| history
security/selinux/ss/services.c	patch \|	diff1 \|	diff2 \|	blob \| history
security/smack/smackfs.c	patch \|	diff1 \|	diff2 \|	blob \| history