diff options
author | James Morris <jmorris@namei.org> | 2011-08-08 14:04:10 +1000 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2011-08-08 14:04:10 +1000 |
commit | 1d568ab068c021672d6cd7f50f92a3695a921ffb (patch) | |
tree | 1c4ab86d4fbc8c699f8351f782dfbace586c5d36 /security/security.c | |
parent | Merge branch 'linus'; commit 'v3.1-rc1' into next (diff) | |
parent | doc: Update the email address for Paul Moore in various source files (diff) | |
download | linux-dev-1d568ab068c021672d6cd7f50f92a3695a921ffb.tar.xz linux-dev-1d568ab068c021672d6cd7f50f92a3695a921ffb.zip |
Merge branch 'next-queue' into next
Diffstat (limited to 'security/security.c')
0 files changed, 0 insertions, 0 deletions