diff options
| author | James Morris <james.l.morris@oracle.com> | 2012-06-10 08:48:36 -0400 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2012-06-10 08:48:36 -0400 |
| commit | f52c44cd27b4a0be37ef97f0466e4095ebebef3f (patch) | |
| tree | a77ad8cffa35427352cd18f94ed9339640e4d473 /security/selinux/hooks.c | |
| parent | 7cf4206a99d1b3e61bdbc7cbbf4a7bf6a9dfcc68 (diff) | |
Merge branches 'next-queue' and 'next' into next
Pull in changes submitted during upstream merge window.
Diffstat (limited to 'security/selinux/hooks.c')
0 files changed, 0 insertions, 0 deletions