summaryrefslogtreecommitdiff
path: root/security/apparmor
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2011-01-11 22:01:45 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2011-01-11 22:01:45 -0800
commit01c728a246a1072fe9664b91179a47937182b0a0 (patch)
treeca1e1d997284777b28981040dae97ee668aadaee /security/apparmor
parent554738da71004d96e06fb75f4772dfc3b0f47810 (diff)
parent50a88cb7eddb971077ae7dff76b116747c12c371 (diff)
Merge branch 'next' into for-linus
Diffstat (limited to 'security/apparmor')
0 files changed, 0 insertions, 0 deletions