diff options
| author | James Morris <james.l.morris@oracle.com> | 2014-01-06 09:45:59 -0500 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2014-01-06 09:45:59 -0500 |
| commit | d4a82a4a033d563f1dc2c944eec2358cb38432d0 (patch) | |
| tree | 83f8fca138299584d47930d2509151ea38050253 /arch/s390/kernel | |
| parent | 5f64822d63efa20cee9efe8766b3a62ab6a1f6c3 (diff) | |
| parent | 465954cd649a7d8cd331695bd24a16bcb5c4c716 (diff) | |
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 'arch/s390/kernel')
0 files changed, 0 insertions, 0 deletions