Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into next

author James Morris <[email protected]>

Sun, 9 Jan 2011 23:40:42 +0000 (10:40 +1100)

committer James Morris <[email protected]>

Sun, 9 Jan 2011 23:40:42 +0000 (10:40 +1100)
author James Morris <[email protected]>
Sun, 9 Jan 2011 23:40:42 +0000 (10:40 +1100)
committer James Morris <[email protected]>
Sun, 9 Jan 2011 23:40:42 +0000 (10:40 +1100)
diff --cc security/selinux/hooks.c
Simple merge
diff --cc security/selinux/selinuxfs.c
Simple merge
author	James Morris <[email protected]>
	Sun, 9 Jan 2011 23:40:42 +0000 (10:40 +1100)
committer	James Morris <[email protected]>
	Sun, 9 Jan 2011 23:40:42 +0000 (10:40 +1100)
		1	2
security/selinux/hooks.c	patch \|	diff1 \|	diff2 \|	blob \| history
security/selinux/selinuxfs.c	patch \|	diff1 \|	diff2 \|	blob \| history