diff options
author | James Morris <jmorris@namei.org> | 2011-05-24 14:55:24 +0200 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2011-05-24 14:55:24 +0200 |
commit | 434d42cfd05a7cc452457a81d2029540cba12150 (patch) | |
tree | 3a6b9b7f9ff2e1b7409dd66c15242b2a75aa4422 /security/smack | |
parent | Merge branch 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/let... (diff) | |
parent | Merge branch 'master' into next (diff) | |
download | linux-434d42cfd05a7cc452457a81d2029540cba12150.tar.xz linux-434d42cfd05a7cc452457a81d2029540cba12150.zip |
Merge branch 'next' into for-linus
Diffstat (limited to 'security/smack')
0 files changed, 0 insertions, 0 deletions