]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' of git://git.infradead.org/users/pcmoore/selinux into ra-next
authorJames Morris <james.l.morris@oracle.com>
Tue, 22 Oct 2013 11:26:41 +0000 (22:26 +1100)
committerJames Morris <james.l.morris@oracle.com>
Tue, 22 Oct 2013 11:26:41 +0000 (22:26 +1100)
commitc3023497008c9b82522eeccb65b1e2ab5fec3857
tree1953a953770b8047a95ef4d431bb693433922043
parentc6f50c5abd13d8af1dc09b4acd632c45962189cd
parentcd23d586dd83a734ff97e55ee97f077a3b88fa2a
Merge branch 'master' of git://git.infradead.org/users/pcmoore/selinux into ra-next
include/linux/security.h
security/capability.c
security/security.c
security/selinux/hooks.c
security/selinux/include/xfrm.h