From: Linus Torvalds Date: Sat, 30 Oct 2010 15:35:35 +0000 (-0700) Subject: Merge branch 'audit.b64' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit... X-Git-Tag: v2.6.37-rc1~21 X-Git-Url: http://bbs.cooldavid.org/git/?p=net-next-2.6.git;a=commitdiff_plain;h=847f877600313e65c5659476b30d74a6f66e388e Merge branch 'audit.b64' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current * 'audit.b64' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current: audit mmap audit: make link()/linkat() match "attribute change" predicate audit: Use rcu for task lookup protection audit: Do not send uninitialized data for AUDIT_TTY_GET audit: Call tty_audit_push_task() outside preempt disabled in untag_chunk() we need to do alloc_chunk() a bit earlier audit: make functions static Audit: add support to match lsm labels on user audit messages --- 847f877600313e65c5659476b30d74a6f66e388e