]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into next
authorJames Morris <james.l.morris@oracle.com>
Tue, 22 May 2012 01:21:06 +0000 (11:21 +1000)
committerJames Morris <james.l.morris@oracle.com>
Tue, 22 May 2012 01:21:06 +0000 (11:21 +1000)
commitcafe9f49bf94c496c28fe2c58e2c67a223f3744b
tree9d9b1cfa3fc17f0cc13f34ca697306cb1f46b05f
parent60be84f85378c133e0f00628083ca4450455fcfd
parentf0933ecf3f575045143d3e763cd6bc38b7f6e0c7
Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into next

Per pull request, for 3.5.
include/linux/security.h
security/apparmor/policy.c
security/selinux/hooks.c
security/smack/smack.h
security/smack/smack_lsm.c