aboutsummaryrefslogtreecommitdiff
path: root/security/smack
diff options
context:
space:
mode:
authorJames Morris <james.l.morris@oracle.com>2013-05-12 21:28:38 +1000
committerJames Morris <james.l.morris@oracle.com>2013-05-12 21:28:38 +1000
commitbd71164abc141ea696014e3e23c561b0d7f1b434 (patch)
tree3b9c64698800566197bf4ecec604ba8bb1228bd3 /security/smack
parentf722406faae2d073cc1d01063d1123c35425939e (diff)
parent2654bfbc2bd0e1e64f0b257c21da23f6cec32c6c (diff)
downloadlinux-bd71164abc141ea696014e3e23c561b0d7f1b434.tar.gz
Merge tag 'aa-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor into ra-next
Diffstat (limited to 'security/smack')
0 files changed, 0 insertions, 0 deletions