diff options
| author | James Morris <james.l.morris@oracle.com> | 2013-08-22 18:50:12 +0200 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2013-08-22 18:50:12 +0200 |
| commit | 73203361468894c3c017bfbdd9ddcbb468039604 (patch) | |
| tree | bfda3843b96c0056ef84d0957110833bb21f2b02 /fs/ocfs2 | |
| parent | apparmor: add the ability to report a sha1 hash of loaded policy (diff) | |
| parent | Smack: parse multiple rules per write to load2, up to PAGE_SIZE-1 bytes (diff) | |
| download | linux-73203361468894c3c017bfbdd9ddcbb468039604.tar.xz linux-73203361468894c3c017bfbdd9ddcbb468039604.zip | |
Merge branch 'smack-for-3.12' of git://git.gitorious.org/smack-next/kernel into ra-next
Diffstat (limited to 'fs/ocfs2')
0 files changed, 0 insertions, 0 deletions