diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 14:41:22 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 14:41:22 -0400 |
commit | 9781db7b345b5dfe93787aaaf310c861db7c1ede (patch) | |
tree | d9796e29fd914ca04835636be95bbd5082a034fd /MAINTAINERS | |
parent | 97094dcf5cefc8ccfdf93839f54dac2c4d316165 (diff) | |
parent | 8b67dca9420474623709e00d72a066068a502b20 (diff) |
Merge branch 'audit.b50' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current
* 'audit.b50' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current:
[PATCH] new predicate - AUDIT_FILETYPE
[patch 2/2] Use find_task_by_vpid in audit code
[patch 1/2] audit: let userspace fully control TTY input auditing
[PATCH 2/2] audit: fix sparse shadowed variable warnings
[PATCH 1/2] audit: move extern declarations to audit.h
Audit: MAINTAINERS update
Audit: increase the maximum length of the key field
Audit: standardize string audit interfaces
Audit: stop deadlock from signals under load
Audit: save audit_backlog_limit audit messages in case auditd comes back
Audit: collect sessionid in netlink messages
Audit: end printk with newline
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index c4e5b5dec15..bca09ed7702 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -752,11 +752,13 @@ W: http://atmelwlandriver.sourceforge.net/ | |||
752 | S: Maintained | 752 | S: Maintained |
753 | 753 | ||
754 | AUDIT SUBSYSTEM | 754 | AUDIT SUBSYSTEM |
755 | P: David Woodhouse | 755 | P: Al Viro |
756 | M: dwmw2@infradead.org | 756 | M: viro@zeniv.linux.org.uk |
757 | P: Eric Paris | ||
758 | M: eparis@redhat.com | ||
757 | L: linux-audit@redhat.com (subscribers-only) | 759 | L: linux-audit@redhat.com (subscribers-only) |
758 | W: http://people.redhat.com/sgrubb/audit/ | 760 | W: http://people.redhat.com/sgrubb/audit/ |
759 | T: git kernel.org:/pub/scm/linux/kernel/git/dwmw2/audit-2.6.git | 761 | T: git git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current.git |
760 | S: Maintained | 762 | S: Maintained |
761 | 763 | ||
762 | AUXILIARY DISPLAY DRIVERS | 764 | AUXILIARY DISPLAY DRIVERS |