diff options
| author | James Morris <james.l.morris@oracle.com> | 2014-01-06 15:45:59 +0100 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2014-01-06 15:45:59 +0100 |
| commit | d4a82a4a033d563f1dc2c944eec2358cb38432d0 (patch) | |
| tree | 83f8fca138299584d47930d2509151ea38050253 /drivers/nubus | |
| parent | tpm/tpm-sysfs: active_show() can be static (diff) | |
| parent | selinux: selinux_setprocattr()->ptrace_parent() needs rcu_read_lock() (diff) | |
| download | linux-d4a82a4a033d563f1dc2c944eec2358cb38432d0.tar.xz linux-d4a82a4a033d563f1dc2c944eec2358cb38432d0.zip | |
Merge branch 'master' of git://git.infradead.org/users/pcmoore/selinux into next
Conflicts:
security/selinux/hooks.c
Resolved using request struct.
Signed-off-by: James Morris <james.l.morris@oracle.com>
Diffstat (limited to 'drivers/nubus')
0 files changed, 0 insertions, 0 deletions