diff options
author | Pekka Enberg <penberg@kernel.org> | 2011-01-09 11:05:53 +0200 |
---|---|---|
committer | Pekka Enberg <penberg@kernel.org> | 2011-01-09 11:05:53 +0200 |
commit | a45b0616e7ee9db4c1b2b9a4a79a974325fa9bf3 (patch) | |
tree | 661b2cc7b0117fc1bbec27fc196c059002b4698b /security/apparmor | |
parent | 3c0eee3fe6a3a1c745379547c7e7c904aa64f6d5 (diff) | |
parent | 8165984acf825917437debae519209073c32a5a7 (diff) |
Merge branch 'slab/next' into for-linus
Diffstat (limited to 'security/apparmor')
0 files changed, 0 insertions, 0 deletions