Merge branch 'audit.b50' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 29 Apr 2008 18:41:22 +0000 (11:41 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 29 Apr 2008 18:41:22 +0000 (11:41 -0700)
commit9781db7b345b5dfe93787aaaf310c861db7c1ede
treed9796e29fd914ca04835636be95bbd5082a034fd
parent97094dcf5cefc8ccfdf93839f54dac2c4d316165
parent8b67dca9420474623709e00d72a066068a502b20
Merge branch 'audit.b50' of git://git./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
MAINTAINERS
drivers/char/tty_io.c
kernel/auditfilter.c
net/xfrm/xfrm_state.c
security/smack/smackfs.c