diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2020-01-10 13:51:16 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2020-01-10 13:51:16 +1100 |
| commit | 94080b0b081fe8ac8a3d10c9b8353c8c27a974c0 (patch) | |
| tree | 509e1ef6356c6c013a70c235eb49f7c070ed6909 /MAINTAINERS | |
| parent | 164064cacdaee2ed4b62d2084280d358fc15d4aa (diff) | |
| parent | d41415eb5edae2a750940aa24924993b81947040 (diff) | |
Merge remote-tracking branch 'selinux/next'
# Conflicts:
# include/linux/lsm_audit.h
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index d5867d7a1103..6632f042e561 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -14879,6 +14879,7 @@ F: include/uapi/linux/selinux_netlink.h F: security/selinux/ F: scripts/selinux/ F: Documentation/admin-guide/LSM/SELinux.rst +F: Documentation/ABI/obsolete/sysfs-selinux-disable SENSABLE PHANTOM M: Jiri Slaby <jirislaby@gmail.com> |