diff options
| author | James Morris <jmorris@namei.org> | 2011-03-09 04:12:07 +0100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-03-09 04:12:07 +0100 |
| commit | c151694b2c48d956ac8c8c59c6927f89cc29ef70 (patch) | |
| tree | 6d24bfde33c2c5899ea33aef4b81d06d7ac36a2f /fs | |
| parent | Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into next (diff) | |
| parent | AppArmor: kill unused macros in lsm.c (diff) | |
| download | linux-c151694b2c48d956ac8c8c59c6927f89cc29ef70.tar.xz linux-c151694b2c48d956ac8c8c59c6927f89cc29ef70.zip | |
Merge branch 'security-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/apparmor-dev into next
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions