]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'security/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 May 2014 03:30:47 +0000 (13:30 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 May 2014 03:30:47 +0000 (13:30 +1000)
1  2 
Documentation/security/Smack.txt
include/linux/security.h
security/security.c
security/selinux/hooks.c

Simple merge
Simple merge
Simple merge
Simple merge