]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6894158 f7a4da1)
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)
commit2723eed4ff0f5fc580022a0272ed4f35999cdeaf
treed591a08e7e45615b51d8b5ee1634a29920f62c3ftree | snapshot
parent68941587c3f7dd66afd2bde64d6129ba0fc23db2commit | diff
parentf7a4da19a99987256daa18b4ef796449ca9634f8commit | diff
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 diff1 | diff2 | blob | history
security/selinux/avc.c diff1 | diff2 | blob | history
security/selinux/hooks.c diff1 | diff2 | blob | history
security/selinux/selinuxfs.c diff1 | diff2 | blob | history
security/selinux/ss/services.c diff1 | diff2 | blob | history
security/smack/smack_lsm.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.