Commit - rpms/selinux-policy - cdda8feee002771a0fec76c5588aedec59edf92e

    Merge branches 'master', 'master' and 'master' of http://oss.tresys.com/git/refpolicy
    
    Conflicts:
    	policy/modules/admin/alsa.fc
    	policy/modules/admin/alsa.if
    	policy/modules/kernel/filesystem.fc

policy/modules/admin/alsa.fc

file modified

+0 -2

policy/modules/admin/alsa.if

file modified

+39 -8

policy/modules/admin/alsa.te

file modified

+1 -2

policy/modules/kernel/filesystem.fc

file modified

+1 -0

policy/modules/kernel/filesystem.if

file modified

+8 -0

policy/modules/kernel/filesystem.te

file modified

+1 -1

rpms / selinux-policy

Source Code

cdda8f Merge branches 'master', 'master' and 'master' of http://oss.tresys.com/git/refpolicy

Merged and Committed by Dan Walsh 14 years ago

`cdda8f` Merge branches 'master', 'master' and 'master' of http://oss.tresys.com/git/refpolicy