From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 29 Apr 2008 18:41:22 +0000 (-0700)
Subject: Merge branch 'audit.b50' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit... 
X-Git-Tag: v2.6.26-rc1~361
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=9781db7b345b5dfe93787aaaf310c861db7c1ede;p=linux-2.6-omap-h63xx.git

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
---

9781db7b345b5dfe93787aaaf310c861db7c1ede