diff options
| author | James Morris <james.l.morris@oracle.com> | 2012-03-20 12:52:17 +1100 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2012-03-20 12:52:17 +1100 |
| commit | 09f61cdbb32a9d812c618d3922db533542736bb0 (patch) | |
| tree | 90d8e9163e269d0ed9e01f0dac500316014b88c5 /fs/proc | |
| parent | 7d7473dbdb9121dd1b5939566660d51130ecda3a (diff) | |
| parent | 7e570145cb022beeb58e3f691e0418477b670223 (diff) | |
Merge branch 'for-security' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor into next
Diffstat (limited to 'fs/proc')
0 files changed, 0 insertions, 0 deletions