Merge branch 'master' into next

author James Morris <[email protected]>

Thu, 28 Aug 2008 00:47:34 +0000 (10:47 +1000)

committer James Morris <[email protected]>

Thu, 28 Aug 2008 00:47:34 +0000 (10:47 +1000)
author James Morris <[email protected]>
Thu, 28 Aug 2008 00:47:34 +0000 (10:47 +1000)
committer James Morris <[email protected]>
Thu, 28 Aug 2008 00:47:34 +0000 (10:47 +1000)
diff --cc security/security.c
Simple merge
diff --cc security/selinux/hooks.c
Simple merge
author	James Morris <[email protected]>
	Thu, 28 Aug 2008 00:47:34 +0000 (10:47 +1000)
committer	James Morris <[email protected]>
	Thu, 28 Aug 2008 00:47:34 +0000 (10:47 +1000)
		1	2
security/security.c	patch \|	diff1 \|	diff2 \|	blob \| history
security/selinux/hooks.c	patch \|	diff1 \|	diff2 \|	blob \| history