summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorPaul Moore <pmoore@redhat.com>2014-12-09 14:38:30 -0500
committerPaul Moore <pmoore@redhat.com>2014-12-09 14:38:30 -0500
commit0f7e94ee40d06f7a04e039392dfee8244bd8a7e0 (patch)
tree4a14540900d72003b4bc5e06d1531fddba9bd4d5 /MAINTAINERS
parent799b601451b21ebe7af0e6e8f6e2ccd4683c5064 (diff)
parent0288d7183c41c0192d2963d44590f346f4aee917 (diff)
downloadlinux-0f7e94ee40d06f7a04e039392dfee8244bd8a7e0.tar.bz2
Merge branch 'next' into upstream for v3.19
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS5
1 files changed, 3 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index c2066f4c3286..86c24fd147d1 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1689,10 +1689,11 @@ S: Supported
F: drivers/scsi/esas2r
AUDIT SUBSYSTEM
+M: Paul Moore <paul@paul-moore.com>
M: Eric Paris <eparis@redhat.com>
-L: linux-audit@redhat.com (subscribers-only)
+L: linux-audit@redhat.com (moderated for non-subscribers)
W: http://people.redhat.com/sgrubb/audit/
-T: git git://git.infradead.org/users/eparis/audit.git
+T: git git://git.infradead.org/users/pcmoore/audit
S: Maintained
F: include/linux/audit.h
F: include/uapi/linux/audit.h