]> git.ipfire.org Git - people/stevee/selinux-policy.git/commit
Merge branch 'master' of ssh://git.fedorahosted.org/git/selinux-policy
authorDan Walsh <dwalsh@redhat.com>
Wed, 16 Nov 2011 15:49:01 +0000 (10:49 -0500)
committerDan Walsh <dwalsh@redhat.com>
Wed, 16 Nov 2011 15:49:01 +0000 (10:49 -0500)
commit90c9629d17e156539c801f1fd2c445144fe8006e
tree2f9ed53ee36c7e69b35cfa54d2676e5348b113b6
parent588885e55e015868067ea230ad00fed2dd2de68e
parent558fe7df412e86f450840f05b1274e213eaf20ab
Merge branch 'master' of ssh://git.fedorahosted.org/git/selinux-policy

Conflicts:
policy/modules/services/policykit.te
policy/modules/kernel/devices.te
policy/modules/services/policykit.te