]> git.ipfire.org Git - people/stevee/selinux-policy.git/commit
Merge branch 'master' of http://git.fedorahosted.org/git/selinux-policy
authorDan Walsh <dwalsh@redhat.com>
Mon, 11 Apr 2011 20:16:28 +0000 (16:16 -0400)
committerDan Walsh <dwalsh@redhat.com>
Mon, 11 Apr 2011 20:16:28 +0000 (16:16 -0400)
commitca6d2eeec320d98107b947b9f59f64919f991227
tree94a9e96c83406c26cbef1fe008bdb4703e422d41
parent72eaebd0be7458e03fd45ddfa476d0ac29d7fad3
parent122c969ac4be850dabb60dd74a61323b6b1662de
Merge branch 'master' of http://git.fedorahosted.org/git/selinux-policy

Conflicts:
policy/modules/kernel/devices.if
policy/modules/kernel/files.if
policy/modules/kernel/devices.if
policy/modules/kernel/files.if
policy/modules/kernel/terminal.if
policy/modules/system/userdomain.if