]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into for-linus
authorJames Morris <jmorris@namei.org>
Tue, 24 May 2011 13:20:19 +0000 (23:20 +1000)
committerJames Morris <jmorris@namei.org>
Tue, 24 May 2011 13:20:19 +0000 (23:20 +1000)
commit146ce9166de5aa66824ca536286988fc121c72e6
treed591a08e7e45615b51d8b5ee1634a29920f62c3f
parentdb46c272c5afcd3a6bc5214d867ec5b6b16e05b9
parentf7a4da19a99987256daa18b4ef796449ca9634f8
Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into for-linus

Conflicts:
lib/flex_array.c
security/selinux/avc.c
security/selinux/hooks.c
security/selinux/ss/policydb.c
security/smack/smack_lsm.c

Manually resolve conflicts.

Signed-off-by: James Morris <jmorris@namei.org>
MAINTAINERS
security/selinux/avc.c
security/selinux/hooks.c
security/selinux/selinuxfs.c
security/selinux/ss/services.c
security/smack/smack_lsm.c