Merge branch 'master' into next

author James Morris <[email protected]>

Thu, 18 Jun 2009 22:20:55 +0000 (08:20 +1000)

committer James Morris <[email protected]>

Thu, 18 Jun 2009 22:20:55 +0000 (08:20 +1000)
author James Morris <[email protected]>
Thu, 18 Jun 2009 22:20:55 +0000 (08:20 +1000)
committer James Morris <[email protected]>
Thu, 18 Jun 2009 22:20:55 +0000 (08:20 +1000)
diff --cc security/selinux/avc.c
Simple merge
diff --cc security/selinux/ss/services.c
Simple merge
author	James Morris <[email protected]>
	Thu, 18 Jun 2009 22:20:55 +0000 (08:20 +1000)
committer	James Morris <[email protected]>
	Thu, 18 Jun 2009 22:20:55 +0000 (08:20 +1000)
		1	2
security/selinux/avc.c	patch \|	diff1 \|	diff2 \|	blob \| history
security/selinux/ss/services.c	patch \|	diff1 \|	diff2 \|	blob \| history