Dan Walsh cab9bc9c58 Merge branch 'master' of ssh://git.fedorahosted.org/git/selinux-policy; branch 'master' of http://oss.tresys.com/git/refpolicy ... Conflicts: policy/modules/admin/amanda.if policy/modules/system/init.te policy/modules/system/miscfiles.if policy/modules/system/miscfiles.te policy/modules/system/userdomain.if		2010-09-10 13:02:25 -04:00
..
admin	Merge branch 'master' of ssh://git.fedorahosted.org/git/selinux-policy; branch 'master' of http://oss.tresys.com/git/refpolicy	2010-09-10 13:02:25 -04:00
apps	Merge branch 'master' of ssh://git.fedorahosted.org/git/selinux-policy; branch 'master' of http://oss.tresys.com/git/refpolicy	2010-09-10 13:02:25 -04:00
kernel	Allow hugetlbfs_t to be on device_t file system	2010-09-10 10:10:34 -04:00
roles	Mozilla_plugin needs to getattr on tmpfs and no longer needs to write to tmpfs_t	2010-09-08 12:06:20 -04:00
services	Merge branch 'master' of ssh://git.fedorahosted.org/git/selinux-policy; branch 'master' of http://oss.tresys.com/git/refpolicy	2010-09-10 13:02:25 -04:00
system	Merge branch 'master' of ssh://git.fedorahosted.org/git/selinux-policy; branch 'master' of http://oss.tresys.com/git/refpolicy	2010-09-10 13:02:25 -04:00