]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'selinux/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 31 Jul 2013 02:22:00 +0000 (12:22 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 31 Jul 2013 02:22:00 +0000 (12:22 +1000)
commitacb333b013d0817610cf411abf283c6ba3db141f
tree544a07b8e0f20c31bc76ec264ed9a609625d7bdb
parent0db27b949279cb8bd67957d27d987c5ad5e2bcf3
parent2be4d74f2fd45460d70d4fe65cc1972ef45bf849
Merge remote-tracking branch 'selinux/master'

Conflicts:
security/selinux/hooks.c
include/linux/security.h
security/capability.c
security/security.c
security/selinux/hooks.c
security/selinux/include/security.h
security/selinux/ss/policydb.c