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)
commit6f799c97f37fc0ee2c9c427fa0dada637394886c
tree1953a953770b8047a95ef4d431bb693433922043
parenteb8948a03704f3dbbfc7e83090e20e93c6c476d2
parent42d64e1add3a1ce8a787116036163b8724362145
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