]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'selinux/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 Aug 2013 02:31:06 +0000 (12:31 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 Aug 2013 02:31:06 +0000 (12:31 +1000)
commitf6fcac5eb29560b6c3fb3be476ccd55ca0467f27
tree842492b687f5dcae5c0e79751c5365ed91c99ec6
parent2fcdbae9e8291a3b5b3943037010e65354a9efe3
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/include/xfrm.h
security/selinux/ss/policydb.c